Merge branch 'st/python'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 12:28:10 +0000 (13:28 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 12:28:10 +0000 (13:28 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge