merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 2 Jul 2009 05:14:09 +0000 (07:14 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 2 Jul 2009 05:14:09 +0000 (07:14 +0200)

Trivial merge