Merge branch 'master' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 17:12:33 +0000 (18:12 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 17:12:33 +0000 (18:12 +0100)

Trivial merge