Merge branch 'master' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Sat, 29 Jan 2011 14:52:48 +0000 (15:52 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sat, 29 Jan 2011 14:52:48 +0000 (15:52 +0100)

Trivial merge