Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 15 Nov 2011 06:20:22 +0000 (14:20 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 15 Nov 2011 06:20:22 +0000 (14:20 +0800)

Trivial merge