Merge remote-tracking branch 'origin/new/bug_6971'
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 7 Dec 2011 14:58:38 +0000 (15:58 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 7 Dec 2011 14:58:38 +0000 (15:58 +0100)

Trivial merge