Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 26 Oct 2011 04:55:05 +0000 (12:55 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 26 Oct 2011 04:55:05 +0000 (12:55 +0800)

Trivial merge