Merge branch 'sasl'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)

Trivial merge