Update for sasl fixes.
authorBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 00:01:42 +0000 (16:01 -0800)
committerBrian Aker <brian@tangent.org>
Tue, 14 Feb 2012 00:01:42 +0000 (16:01 -0800)

Trivial merge