OSDN Git Service

Merge upstream to r133718, Fri. 24th June 2011.
authorNowar Gu <nowar100@gmail.com>
Thu, 23 Jun 2011 17:00:13 +0000 (01:00 +0800)
committerNowar Gu <nowar100@gmail.com>
Thu, 23 Jun 2011 17:00:36 +0000 (01:00 +0800)
commit8012bd3687ad40b9bb18505c51ab5cf88eb00c45
tree08e4f487cfbb064b3347d7f58895aa0bb63003ac
parentd095764b07f2e8f8c555ee2d4c3cdb8d42ad4a27
parent83471853b1d5a9efe6b9e7565c457fc901f84926
Merge upstream to r133718, Fri. 24th June 2011.