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

Trivial merge