Merge remote-tracking branch 'origin/new/bug_7661'

This commit is contained in:
Paul Poulain 2012-03-13 18:14:26 +01:00
commit 49c387cddf
8 changed files with 2 additions and 2 deletions