Merge remote-tracking branch 'origin/new/bug_6875'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 17 Feb 2012 08:08:16 +0000 (09:08 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 17 Feb 2012 08:08:16 +0000 (09:08 +0100)

Trivial merge