Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 19 Sep 2011 06:24:04 +0000 (14:24 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 19 Sep 2011 06:24:04 +0000 (14:24 +0800)
commitad7bb392c599c801106bf2d15ccdd4a07fe6efda
tree2c904d59aa03e0cf64c05a6693ea15e353b4d1a5
parent65e498e3f903517104a6008f739b26f91e3d0610
parentf315e760de3f9e15088cedec89139533a0717f3a
Merge branch 'master' into msvc-support-master