Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 28 Nov 2008 21:29:43 +0000 (22:29 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 28 Nov 2008 21:29:43 +0000 (22:29 +0100)
commitcb4dd13c2327c13d486b6abe572f4af2398b65de
tree42bbcce7b61f45500229be66fec3cb109c1c3dd3
parentadec423b50f97888553fcfe58459eee151ac4184
parent288365e77a154b98e0a175be2801da5a15e2c0d3
Merge commit 'fml/master'