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)
commit716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5
treeede9da164267b968f3c05e0340ba12e06b8d3516
parentebc83885b750d46eb290192ae25f6b9a92bdd15f
parentcad5d1cb5af7210154814b60825576d14740158f
Merge from trunk.