Merge from trunk.
commitf6206a442e3e39f8e0a9d63fbb399a3af03fe765
authorStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 21:40:50 +0000 (21 23:40 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 21:40:50 +0000 (21 23:40 +0200)
treef5d388c1a5f306acc2f870ad4099c2e11125d824
parent5b8f19cc5e330bd601db29b6f695985180e831de
parent9de1114ad8df69a83bb5f36c4c285f39eaa7d448
Merge from trunk.