Merge branch 'v3-3-test' of /home/jmcd/samba/git.samba.org/samba-master into 33-test
authorJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:24:49 +0000 (09:24 +0200)
committerJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:24:49 +0000 (09:24 +0200)

Trivial merge