Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Tue, 16 Mar 2010 22:19:52 +0000 (23:19 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 16 Mar 2010 22:19:52 +0000 (23:19 +0100)
commitd3cfff9354cfd140b65c9b1197e6deca33615326
tree204022c4b0167ae3163f3c703aca31a6ef58e33a
parentc7066796e41997118aa10be3965d8e4bb98c1886
parent098ba881094213af84b7cbd3d9e00e59044b9540
Merge branch 'master' into gregoa