Merge remote-tracking branch 'origin/new/bug_6990'
authorPaul Poulain <paul.poulain@biblibre.com>
Tue, 17 Jan 2012 14:07:09 +0000 (15:07 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Tue, 17 Jan 2012 14:07:09 +0000 (15:07 +0100)

Trivial merge