Merge remote-tracking branch 'origin/new/bug_6966'
authorPaul Poulain <paul.poulain@biblibre.com>
Sat, 3 Dec 2011 06:52:07 +0000 (07:52 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Sat, 3 Dec 2011 06:52:07 +0000 (07:52 +0100)

Trivial merge