Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Mon, 16 Mar 2009 20:33:06 +0000 (21:33 +0100)
committerFrancois Fleuret <francois@fleuret.org>
Mon, 16 Mar 2009 20:33:06 +0000 (21:33 +0100)
Conflicts:
selector.cc


Trivial merge