Merge branch 'upstream'
authorNeutron Soutmun <neo.neutron@gmail.com>
Thu, 12 Mar 2009 12:08:02 +0000 (19:08 +0700)
committerNeutron Soutmun <neo.neutron@gmail.com>
Thu, 12 Mar 2009 12:08:02 +0000 (19:08 +0700)

Trivial merge