Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 23 Dec 2008 22:14:34 +0000 (23:14 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 23 Dec 2008 22:14:34 +0000 (23:14 +0100)
commit1b6ecb6d4ea35cbc9ab77dddaaa8a68b7436d019
treec2ebc3166c99985b9573c08f676cd599c57747c8
parentf3b245ab25dbcf1ba18dc7c99d2e599128a90229
parenta883830b42e84c58233efcf05c16e9aa4bb7597f
Merge commit 'fml/master'