merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 8 Aug 2009 18:58:14 +0000 (20:58 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 8 Aug 2009 18:58:14 +0000 (20:58 +0200)

Trivial merge