fixed cvs merge problem.
fixed cvs merge problem.


blink1073/pexpect,Depado/pexpect,Depado/pexpect,crdoconnor/pexpect,bangi123/pexpect,crdoconnor/pexpect,dongguangming/pexpect,bangi123/pexpect,nodish/pexpect,Depado/pexpect,blink1073/pexpect,blink1073/pexpect,nodish/pexpect,Wakeupbuddy/pexpect,bangi123/pexpect,Depado/pexpect,Wakeupbuddy/pexpect,nodish/pexpect,quatanium/pexpect,Wakeupbuddy/pexpect,dongguangming/pexpect,rockaboxmedia/pexpect,bangi123/pexpect,rockaboxmedia/pexpect,Wakeupbuddy/pexpect,quatanium/pexpect,crdoconnor/pexpect,dongguangming/pexpect,dongguangming/pexpect,quatanium/pexpect