Merge branch 'master' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Thu, 27 Jan 2011 10:46:26 +0000 (11:46 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 27 Jan 2011 10:46:26 +0000 (11:46 +0100)

Trivial merge