Correct the c-ares directory name in the clean_setup target.
#BACKPORT(1.10)

svn path=/trunk/; revision=49616
wslua: Adda a wtap_encaps name to replace wtap which is too generic.


svn path=/trunk/; revision=49617
If using cygwin, there is no pbcopy or xsel, but we do have putclip.

svn path=/trunk/; revision=49618
Merge remote-tracking branch 'upstream/master'