Merge branch '312/upstream' into 312/master
authorStephane Glondu <steph@glondu.net>
Sun, 18 Apr 2010 12:17:14 +0000 (14:17 +0200)
committerStephane Glondu <steph@glondu.net>
Sun, 18 Apr 2010 12:17:14 +0000 (14:17 +0200)

Trivial merge