Merge branch 'upstream'
authormartin f. krafft <madduck@debian.org>
Thu, 21 Jan 2010 00:58:55 +0000 (13:58 +1300)
committermartin f. krafft <madduck@debian.org>
Thu, 21 Jan 2010 00:58:55 +0000 (13:58 +1300)
commit0ea5f3fc0e0336921ba670a28201b59d2c977cfb
tree86f91b3512899130341aabea68686c4aea113a6a
parent994e46845d57c4cf912b674d45b4ae13b478d6ee
parentc340c1bd1140c0a1b7e0f24ef3ebac806f5fc3e6
Merge branch 'upstream'
configure