Merge commit 'master-20091122' into gtk