Merge branch 'master' of ssh://moonshot-v4/srv/git/cyrus-sasl
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:33:12 +0000 (17:33 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Sun, 1 Jan 2012 17:33:12 +0000 (17:33 +0000)

Trivial merge