Merge remote-tracking branch 'origin/new/bug_6836'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 27 Jan 2012 12:58:50 +0000 (13:58 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 27 Jan 2012 12:58:50 +0000 (13:58 +0100)

Trivial merge