Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 15 Nov 2011 06:20:22 +0000 (14:20 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 15 Nov 2011 06:20:22 +0000 (14:20 +0800)
commit8d0c68347a4ee33bb77c7c21760b63f15db9cf26
treeed825bfd723eb0616a36f8c759c2308ccec51f7b
parent96d4e527ea8bf0e7fd238ba6cafd578f86fea27f
parentb281f2090a8fb042cb471611eab54c26ceba8074
Merge branch 'master' into msvc-support-master