Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:42:00 +0000 (02:42 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:42:00 +0000 (02:42 +0100)
commitda31666c2663759c28c4cff4b2125c5062a51cac
tree75a7b1026071cf20a8c42aab1204ea69cdb7ecb1
parentf8ae60eeb064ade1bf6302c2ed529c24603b1b3e
parentb0aae6b2059553ad758d5a821c5412b7ae40d123
Merge branch 'upstream'

Conflicts:
aclocal.m4
config.guess
config.sub
configure
utils/Makefile.in