Merge remote-tracking branch 'origin/new/bug_2629'
authorPaul Poulain <paul.poulain@biblibre.com>
Tue, 10 Jan 2012 22:35:48 +0000 (23:35 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Tue, 10 Jan 2012 22:35:48 +0000 (23:35 +0100)

Trivial merge