Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:05:07 +0000 (03:05 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:05:07 +0000 (03:05 +0100)
commit44e6972a6f9bb7a0a99114e0d22a66a3cba0f0f8
tree3303ce0e72e56c844765da42b1e779a14726bd97
parent21dd0171407bb047466cf8605a6187fd0d5f7d09
parent14a897be298e6d75687f5d96164901bbd6d080e9
Merge branch 'upstream'