Merge branch 'master' into bloom
authorAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 10:54:46 +0000 (11:54 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 10:54:46 +0000 (11:54 +0100)
1  2 
adu.ggo

diff --cc adu.ggo
Simple merge