Merge branch 'atkwindow'
authorAlejandro Piñeiro <apinheiro@igalia.com>
Tue, 30 Aug 2011 10:26:35 +0000 (12:26 +0200)
committerAlejandro Piñeiro <apinheiro@igalia.com>
Tue, 30 Aug 2011 10:26:35 +0000 (12:26 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge