Merge commit 'origin/master'
authorMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 21:06:23 +0000 (21:06 +0000)
committerMichael Ang <mang@archive.org>
Fri, 24 Sep 2010 21:06:23 +0000 (21:06 +0000)

Trivial merge