reintegrating branch branches/taxeditor/3.0.11-SNAPSHOT
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 22 Jun 2012 13:30:43 +0000 (13:30 +0000)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 22 Jun 2012 13:30:43 +0000 (13:30 +0000)

Trivial merge