Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 19 Sep 2011 06:24:04 +0000 (14:24 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 19 Sep 2011 06:24:04 +0000 (14:24 +0800)

Trivial merge