OSDN Git Service

Merge branch 'dev'
authorFrank Li <lznuaa@gmail.com>
Mon, 7 Sep 2009 13:32:39 +0000 (21:32 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 7 Sep 2009 13:32:39 +0000 (21:32 +0800)

Trivial merge