Merge branch 'master' into r28
authorMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 21:07:05 +0000 (21:07 +0000)
committerMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 21:07:05 +0000 (21:07 +0000)

Trivial merge