Merge branch 'ldap_parser' into database
[meabook] / welcome
2009-12-29 www-datawelcome