Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 29 Sep 2011 08:33:02 +0000 (16:33 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 29 Sep 2011 08:33:02 +0000 (16:33 +0800)
commitf0dfd8ab07809ae54667e5dcea581f429d476d2f
treea25dadebed5e8e5f4afc9880e794cd26d4504888
parent9e822d9ae4d65b0fae2843bc57119b3d879502d7
parent7d515553e662210e8a17c3f6067f681bdbed1bbe
Merge branch 'master' into msvc-support-master

Conflicts:
tests/interactive/Makefile.am
configure.ac
tests/interactive/Makefile.am