Merge
authorn.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 13:30:57 +0000 (13:30 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 13:30:57 +0000 (13:30 +0000)

Trivial merge