Merge branch 'master-20091209' into gtk