Merge branch 'master' into bloom
authorAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 10:54:46 +0000 (11:54 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 10:54:46 +0000 (11:54 +0100)
commit78f42703571424f6d409a709fead7377f7a10616
tree955faf636968410ee6bc066f10b8e1fe2eea77d6
parente975087dd1dcc5c9921be6592a5a2da7554c8b1a
parent1bcb6f2930d9cfcd649f2cfcef5032f9ae53ca7a
Merge branch 'master' into bloom
adu.ggo