uffuff/test — pull request #1 by iinux (2014-06-13 14:51:54+00:00)
Title: update main from iinux 201406132251 

update main from iinux 201406132251 2