sync with gnome master
authorAlan Knowles <alan@akbkhome.com>
Thu, 31 Mar 2011 05:39:28 +0000 (13:39 +0800)
committerAlan Knowles <alan@akbkhome.com>
Thu, 31 Mar 2011 05:39:28 +0000 (13:39 +0800)

Trivial merge