Merge branch 'master' into stable
authorSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 17:24:06 +0000 (19:24 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 17:24:06 +0000 (19:24 +0200)

Trivial merge