Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster
authorJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:28:01 +0000 (09:28 +0200)
committerJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:28:01 +0000 (09:28 +0200)

Trivial merge