Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 16:24:37 +0000 (17:24 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 16:24:37 +0000 (17:24 +0100)
commit9612ca14cae3d43c049554b133e838feab94a9a1
tree0312d453eff977b4bea80690172b89e7e2c53f56
parent5e5a4ea6be616a0e9a4322cfb91f17d2353e7591
parent4eac7a8fb19ce4d7fae803fa22deb96fa801f066
Merge branch 'master' into gregoa