Merging latest changes from dev branch
authorn.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 10:21:09 +0000 (10:21 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 10:21:09 +0000 (10:21 +0000)

Trivial merge