Merge remote-tracking branch 'origin/new/bug_5974'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 25 Nov 2011 12:59:25 +0000 (13:59 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 25 Nov 2011 12:59:25 +0000 (13:59 +0100)

Trivial merge