merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 17 May 2013 08:07:15 +0000 (08:07 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 17 May 2013 08:07:15 +0000 (08:07 +0000)
commitc816b2eb50ebaac540c30d8fa0a7a7e27ab3ce9c
tree357a6c348411d6ec810019aee46920c70d5481ef
parentd046a473821b6f9fcc61cda416f4fa758240ccd9
merge-update from trunk