Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 14:36:34 +0000 (15:36 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 14:36:34 +0000 (15:36 +0100)
commitabee973526ec2d9f776753a773a73535e60a81b2
tree1b9586e5676d2b63f91127b6ad13a86d7b7e5d7d
parentffd9355f36e8e65e0e9fb1a8158495c15b002642
parent21ea5a01a90aef6a61095df56b2e5e61ee79cc8d
Merge branch 'master' into gregoa