Automated merge with http://waqas.ath.cx/

Fix for handling latin1 encoded hostnames in SASL

Fix GPL'ing MIT/X licensed code :)

Update HACKERS

Fill blank with URL

Remove stray merge marker

Merge from waqas

(0) -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 tip

mercurial