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)
commit77bbf3713d459c45492e6daed68437edcf863a0c
tree0e2ea82f80e907cea52eb683a362504a3813a463
parent3bc1e1880f232ccaea7c35a0c51bac61df9ac23c
parent83fa295c1236aba5a73d565082dcb58a32f3e446
Merge from mainline.