merge 0.11
authorStefan Behnel <scoder@users.berlios.de>
Sat, 14 Mar 2009 11:05:58 +0000 (12:05 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 14 Mar 2009 11:05:58 +0000 (12:05 +0100)

Trivial merge