merging in latest changes from trunk
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 22 Jun 2012 11:44:48 +0000 (11:44 +0000)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Fri, 22 Jun 2012 11:44:48 +0000 (11:44 +0000)

No differences found