Merge branch 'stable-next' into stable
authorSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 18:22:23 +0000 (20:22 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 18:22:23 +0000 (20:22 +0200)

Trivial merge