Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 21 Jun 2008 15:45:19 +0000 (17:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 21 Jun 2008 15:45:19 +0000 (17:45 +0200)
commit701176ae54981c0685022627c2d7110b2ef51f2d
tree3ce2013e44cd09e62c68e68681931a9b889d4a43
parent09a34d846fcaeb097fd2ee23cca6da88d29bcc81
parent449c55e38ee1bda3becfb9f0c450a319c8ee195b
Merge trunk.