merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 15 Sep 2009 06:31:51 +0000 (08:31 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 15 Sep 2009 06:31:51 +0000 (08:31 +0200)

Trivial merge