ignore
Merge remote-tracking branch 'origin/casperjs' into penny_20130521
Merge remote-tracking branch 'origin/casperjs' into penny_20130522
uploadfile test code
Merge branch 'casperjs' of https://github.com/jinwyp/phantomjs-touzi101 into casperjs