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)
commit574ce81191544b6a1270829bc47f05b34cf7bda5
treedb5b7711416f7b0295324a08b7f7c2200c94eb24
parentc1cce8ea0dd0caa57a5e10e1aa8e1fff55a3e2cb
merging in latest changes from trunk