merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 May 2013 11:23:27 +0000 (11:23 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 May 2013 11:23:27 +0000 (11:23 +0000)
commit0b89a0919876558e985f3f54675a9a5b27cbbf81
tree357a6c348411d6ec810019aee46920c70d5481ef
parentc816b2eb50ebaac540c30d8fa0a7a7e27ab3ce9c
merge-update from trunk