Merge branch 'bug-388437'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 8 Apr 2012 22:12:10 +0000 (00:12 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 8 Apr 2012 22:12:10 +0000 (00:12 +0200)

Trivial merge