Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 3 Aug 2009 14:00:31 +0000 (16:00 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 3 Aug 2009 14:00:31 +0000 (16:00 +0200)
commita284d2903ef9a14f944eae3c14088a42701ca2cf
tree23c7d0a5b32e6fd16490c1c5f76f27de5e50ba00
parentd3876893e9c895b98d2d2b27942f7c235175a4e1
parentf42f8143f383b82e1672b2cecf987dc5b9b23c64
Merge commit 'meins/master'