Merge new SASL code from Tobias and Waqas
authorMatthew Wild <mwild1@gmail.com>
Sat, 15 Nov 2008 19:44:09 +0000 (19:44 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 15 Nov 2008 19:44:09 +0000 (19:44 +0000)

Trivial merge