Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Mon, 13 Apr 2009 13:03:21 +0000 (15:03 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Mon, 13 Apr 2009 13:03:21 +0000 (15:03 +0200)
Conflicts:
selector.cc


Trivial merge