Code

Merge branch 'ka/pinba'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge