merging changes into trunk
authorn.hoffmann <n.hoffmann@localhost>
Wed, 8 Feb 2012 10:13:54 +0000 (10:13 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 8 Feb 2012 10:13:54 +0000 (10:13 +0000)

Trivial merge