Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 11 Oct 2011 09:19:45 +0000 (17:19 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 11 Oct 2011 09:19:45 +0000 (17:19 +0800)

Trivial merge