Merge branches
authorMichael Prokop <devnull@localhost>
Wed, 30 Jan 2008 22:38:03 +0000 (23:38 +0100)
committerMichael Prokop <devnull@localhost>
Wed, 30 Jan 2008 22:38:03 +0000 (23:38 +0100)
1  2 
debian/changelog

Simple merge