Merge from trunk.
authorStephen Berman <stephen.berman@gmx.net>
Fri, 14 Jun 2013 20:07:55 +0000 (22:07 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 14 Jun 2013 20:07:55 +0000 (22:07 +0200)

Trivial merge