Merge branch 'master' into bloom
authorAndre Noll <maan@systemlinux.org>
Wed, 24 Dec 2008 12:14:11 +0000 (13:14 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 24 Dec 2008 12:14:11 +0000 (13:14 +0100)
commit7231c544e2ee3f53f5b2c8bc393b7fd1e0b8d0a7
tree2a45e5c9840ffcc1f473df1be60d130000ee8011
parent2842e5142322dcc2e42172c28fc041dcc5673dd5
parent4d80417123a62a7040d2acedd8052f43df3eacf7
Merge branch 'master' into bloom