OSDN Git Service

Merge 2010.2.
authorJames Teh <jamie@jantrid.net>
Wed, 22 Sep 2010 00:10:50 +0000 (10:10 +1000)
committerJames Teh <jamie@jantrid.net>
Wed, 22 Sep 2010 00:10:50 +0000 (10:10 +1000)

Trivial merge