Merge from alioth
authorPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 15:07:10 +0000 (16:07 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 15:07:10 +0000 (16:07 +0100)
1  2 
debian/install

diff --cc debian/install
Simple merge