Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 14 Mar 2010 23:31:13 +0000 (00:31 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 14 Mar 2010 23:31:13 +0000 (00:31 +0100)
commitc7066796e41997118aa10be3965d8e4bb98c1886
treec08b8ce1ecee39b9b635329274cc604362bbace6
parent2e4c5a9125d92f7cbb2766f718fa01688a7daff2
parent5d4402744ef4249ccc8d717bc1028f5e33ec22b1
Merge branch 'master' into gregoa