Merge commit 'origin/master' into r28
authorMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 20:50:31 +0000 (20:50 +0000)
committerMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 20:50:31 +0000 (20:50 +0000)

Trivial merge