Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 16 Nov 2011 01:15:16 +0000 (09:15 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 16 Nov 2011 01:15:16 +0000 (09:15 +0800)
commitd3a9bf201b42f156d4743b8a194d0e03f41ff7ef
tree83abe6271425dbe3becddeae1220801c0a623cd8
parent39c3ccfca5dc3d10423cb3972a481bfdc915eadc
parentbf9339b8f468dfb12eee95472f0b284acbf56487
Merge branch 'master' into msvc-support-master