Merge commit 'stark/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:27:20 +0000 (19:27 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:27:20 +0000 (19:27 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge