Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 3 Dec 2007 18:39:06 +0000 (19:39 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 3 Dec 2007 18:39:06 +0000 (19:39 +0100)
commit7a0852896a75d852dbd2ac848ec5c0be3b5dea71
tree42ea8af8f4998dbee31aa3a1328e9c59f6a9cb23
parent025bd85e6a7c4618b4741762982b37df35eb7725
parent3913d265cd6c3b8e43bac4f1f0deb1e96bc95a15
Merge commit 'remotes/fml/master'