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)
commite33a6219d8e4bf22725c9cf7ca5abee1936bd7fa
treef9bfdce5fe13e062124c2de2506e8ab5c1020f42
parent8b5d255a2b75b4a9da3166419489f2eb71c309fa
parent8083dd51786492237355003278208824cf99edcb
Merge branch 'master' into msvc-support-master