Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 16 Nov 2011 01:15:16 +0000 (09:15 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 16 Nov 2011 01:15:16 +0000 (09:15 +0800)

Trivial merge