Merge branch 'curr_format'
authorBernd Blessmann <bibi@online.de>
Fri, 6 Jan 2012 15:07:39 +0000 (16:07 +0100)
committerBernd Blessmann <bibi@online.de>
Fri, 6 Jan 2012 15:07:39 +0000 (16:07 +0100)

Trivial merge