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)
commitbd358779861f265a7acff31ead40172735af693e
tree345217a9889dbd29b09bdc80a94265c17719d41f
parent2a97b47f0878cbda86cb6ba0e7e744924810b70e
parentf7394b12358ae453a0c8b85fc307afc1b740010d
Merge from trunk.