Merge from trunk.
authorStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 18:37:42 +0000 (20:37 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 18:37:42 +0000 (20:37 +0200)

Trivial merge