Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 17 Jul 2008 09:42:23 +0000 (11:42 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 17 Jul 2008 09:42:23 +0000 (11:42 +0200)
commit5f7259a4f443c644a15bf0295da15fc62cbd143a
tree74e8d8db533790982cfb1956608ebce9a9ba4857
parentc89c2c02ba7b1c3a32f01e6c10694fd60b230c2a
parent15eeaaf160153f97d6be5f5df1850c8a519215bd
Merge trunk.