Merge branch '3.11/master'
authorStephane Glondu <steph@glondu.net>
Sun, 15 Feb 2009 23:31:30 +0000 (00:31 +0100)
committerStephane Glondu <steph@glondu.net>
Sun, 15 Feb 2009 23:31:30 +0000 (00:31 +0100)

Trivial merge