Merge branch 'master'
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 29 Apr 2013 11:05:45 +0000 (11:05 +0000)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 29 Apr 2013 11:05:45 +0000 (11:05 +0000)

Trivial merge