Merge branch 'maint' into branch-1.11
authorPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:07 +0000 (21:08 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:07 +0000 (21:08 +0100)

Trivial merge