Merge branch 'chester-sparrow'
authorchsieh <chester.developer@hotmail.com>
Tue, 17 May 2011 05:19:51 +0000 (22:19 -0700)
committerchsieh <chester.developer@hotmail.com>
Tue, 17 May 2011 05:19:51 +0000 (22:19 -0700)

Trivial merge