merge
authorAnselm R Garbe <anselm@garbe.us>
Sat, 18 Jul 2009 10:28:31 +0000 (11:28 +0100)
committerAnselm R Garbe <anselm@garbe.us>
Sat, 18 Jul 2009 10:28:31 +0000 (11:28 +0100)

Trivial merge