Merge in sasl update
authorBrian Aker <brian@tangent.org>
Mon, 15 Aug 2011 07:10:59 +0000 (00:10 -0700)
committerBrian Aker <brian@tangent.org>
Mon, 15 Aug 2011 07:10:59 +0000 (00:10 -0700)

Trivial merge