Merge branch 'develop' into loongson3a
authorXianyi Zhang <traits.zhang@gmail.com>
Wed, 27 Mar 2013 14:36:15 +0000 (14:36 +0000)
committerXianyi Zhang <traits.zhang@gmail.com>
Wed, 27 Mar 2013 14:36:15 +0000 (14:36 +0000)

Trivial merge