Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 09:21:41 +0000 (11:21 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 09:21:41 +0000 (11:21 +0200)
commitf93af025e8f7497912429e38eba07037598ff8ea
treeb7fb023188978932338178a507ccdea75b049eb2
parent9612ca14cae3d43c049554b133e838feab94a9a1
parent798c8a955e17c499c5ca7b7a118f874b109dc7e4
Merge branch 'master' into gregoa