Merge commit '614f54b' into cleanup
authorMichael Ang <mang@archive.org>
Wed, 31 Aug 2011 22:03:33 +0000 (22:03 +0000)
committerMichael Ang <mang@archive.org>
Wed, 31 Aug 2011 22:03:33 +0000 (22:03 +0000)

Trivial merge