Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 1 Jul 2008 19:26:26 +0000 (21:26 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 1 Jul 2008 19:26:26 +0000 (21:26 +0200)
commitcecbe8525740b4a899cb1a6c91064e195ae1ada2
treefa40bbc5231803b73775b48e2bea555ab4fde631
parentad33ad0384a415100220ca5edc32111037a1c0c0
parentbab4b8635b3e048e1d7c9a914ddace3433f02164
Merge commit 'fml/master'

Conflicts:

Makefile