Merge branch 'upstream'
commitf555f8d25febc7f4a66d024b4e06d5aa3e6c3b00
authorRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 27 Nov 2009 21:53:43 +0000 (27 22:53 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 27 Nov 2009 21:53:43 +0000 (27 22:53 +0100)
treedab8df67eada3c6935de7c85dd1c0e1cefb7a05a
parent197c41c986564e644e2d2ff3506d6c85dba7aa44
parent2052ecb9306e4f9f2a236180ca6c2e3342c9a76d
Merge branch 'upstream'