Merge branch '312/upstream' into 312/master
authorStephane Glondu <steph@glondu.net>
Sat, 15 May 2010 22:13:11 +0000 (00:13 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 15 May 2010 22:13:11 +0000 (00:13 +0200)

Trivial merge