reintegrate ^/branches/taxeditor/3.0.11-SNAPSHOT
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 27 Jun 2012 15:07:22 +0000 (15:07 +0000)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 27 Jun 2012 15:07:22 +0000 (15:07 +0000)

Trivial merge