Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 18 Oct 2011 07:48:17 +0000 (15:48 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 18 Oct 2011 07:48:17 +0000 (15:48 +0800)

Trivial merge