Merge commit 'meins/next'
authorAndre Noll <maan@systemlinux.org>
Mon, 1 Dec 2008 14:02:26 +0000 (15:02 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 1 Dec 2008 14:02:26 +0000 (15:02 +0100)
1  2 
Makefile.in

diff --cc Makefile.in
Simple merge