Merge trunk.
commite02e4d0dc1753582548e3aaee5bc73842ba87560
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Oct 2010 13:33:30 +0000 (9 15:33 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Oct 2010 13:33:30 +0000 (9 15:33 +0200)
tree91990281435fee001598586f18a81bfd03bce6ff
parente134e1ea861e4d5817e4f3278ef7c0b4dff374ea
parente0b5b30cf1b27aa63efddebad8652101a150cde8
Merge trunk.