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)
commit1cf712854007d5b376877de31c8a474b10a3bc8a
treef034259a358ef9fe01a8df694cc2246d3072aca8
parenta9771b596fba7f02fec52dc94d98f40cda4ca9ae
parent58fec63b9273d6daabfd66905f0481adedbe431e
Merge branch 'master' into msvc-support-master