Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 18:34:12 +0000 (20:34 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 18:34:12 +0000 (20:34 +0200)
commitec503392ddba6000fac8ac18dea94a0e2ba860c1
treecc66f19a2629c05d3d37f276ea3f998d616c06de
parentd045a1d60e84f619f271b5d75509e81502ea2c77
parent8081039bb9ef640b2abbc0954f10af3d0027dff1
Merge branch 'master' into gregoa