Merge branch 'ldap'
authorMichael Spang <mspang@uwaterloo.ca>
Mon, 19 Feb 2007 02:50:51 +0000 (21:50 -0500)
committerMichael Spang <mspang@uwaterloo.ca>
Mon, 19 Feb 2007 02:50:51 +0000 (21:50 -0500)

Trivial merge