Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 17 Dec 2010 00:56:24 +0000 (01:56 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 17 Dec 2010 00:56:24 +0000 (01:56 +0100)
commit3f0e7d450ba6dca015a6b541a004c826fd0ac556
treed2b2cf384c68f517d000e74590c9b1f209676cda
parentc2fa9e7b34837cc75761ca04a33080dec967c9c7
parentaf4c95e5d392338d8b10d866e75ffd6c744531fa
Merge branch 'master' into gregoa