Code

Merge branch 'master' into etch-backports
authorSebastian Harl <sh@tokkee.org>
Mon, 13 Apr 2009 21:05:49 +0000 (23:05 +0200)
committerSebastian Harl <sh@tokkee.org>
Mon, 13 Apr 2009 21:05:49 +0000 (23:05 +0200)
1  2 
debian/rules

diff --cc debian/rules
Simple merge