Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 8 Nov 2011 16:30:32 +0000 (00:30 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 8 Nov 2011 16:30:32 +0000 (00:30 +0800)
commit63dbcc245c0edc92c235374d7918b4a26c4d1158
treea21b6a43448cc2662acc55610545e86bfdf2c723
parentbf8f1afb404c522dc54f31b8171b51453d591465
parentba8d682c0900afd0ef14acc8fe7083d4137f4b63
Merge branch 'master' into msvc-support-master
clutter/Makefile.am