Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Wed, 25 Dec 2013 22:27:00 +0000 (06:27 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Wed, 25 Dec 2013 22:27:00 +0000 (06:27 +0800)

Trivial merge