Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 14:22:23 +0000 (15:22 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 14:22:23 +0000 (15:22 +0100)
commitb22f86cae87b891c2926d6e505300dbbd2f8431f
tree4e7b8c2d5b6f56e421d71d12add18e36550ced7a
parenta757d6e46b25be5ce960bac9275b48959718665c
parent0c0fe71fc74e38111138214c2e9a50241a839375
Merge branch 'master' into gregoa