Merge remote-tracking branch 'origin/new/bug_3280'
authorPaul Poulain <paul.poulain@biblibre.com>
Tue, 3 Jul 2012 16:17:44 +0000 (18:17 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Tue, 3 Jul 2012 16:17:44 +0000 (18:17 +0200)

Trivial merge