Merge branch 'upstream'
authorgregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:44:53 +0000 (19:44 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:44:53 +0000 (19:44 +0100)
commitcfe579bdfd45d0b6f7099f36ae3da3dfe87f1139
tree47528ae26ba72ba47a4eec0271fd2f86039ea4fc
parent677ed0febc0a1db6892a42f97c01b032261485ce
parent1fc4a57399f03d640f1c7a9b8881f16ed50c744f
Merge branch 'upstream'