Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:50:49 +0000 (02:50 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:50:49 +0000 (02:50 +0100)
Conflicts:
configure
support/include/config.h.in


Trivial merge