Merge branch 'calc-in-parse-amount'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 17 May 2011 10:34:41 +0000 (12:34 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 17 May 2011 10:34:41 +0000 (12:34 +0200)

Trivial merge