Merge branch 'develop' into loongson3a
authorXianyi Zhang <traits.zhang@gmail.com>
Tue, 6 Sep 2011 18:19:50 +0000 (18:19 +0000)
committerXianyi Zhang <traits.zhang@gmail.com>
Tue, 6 Sep 2011 18:19:50 +0000 (18:19 +0000)

Trivial merge