DESCRIPTION

Merge commit 'origin/master' into uitests_on_gtk


COMMENTS

author: Marley Hopkins
date: 2010-07-05 19:17:58.000000000

Patch Set 1: Abandoned

Accidently slipped trough the cracks

-------------------------------------
