Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 26 Oct 2011 04:55:05 +0000 (12:55 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 26 Oct 2011 04:55:05 +0000 (12:55 +0800)
commit0406e235bf2f1d26b0f0cca19905a1ecc7e3828b
tree13c12bd7be28710f283ed671764cac00c38d4265
parent7c6038d77b0d0b3323867f8a881d72ca37bb8b7c
parent81a82867e1cbd0b7a4da0ae518b9b1719974ad60
Merge branch 'master' into msvc-support-master