| commit | b3d17b8b166a870f08edbe506b5f4f91e22f0b25 | |
| author | Tim Potter <tpot@samba.org> | |
| Tue, 8 Feb 2005 23:17:44 +0000 (8 23:17 +0000) | ||
| committer | Gerald (Jerry) Carter <jerry@samba.org> | |
| Wed, 10 Oct 2007 15:55:36 +0000 (10 10:55 -0500) | ||
| tree | edf03725ea9ffde702a364e75fe788378aa253b8 | treesnapshot (tar.gz zip) |
| parent | a66913aca1132a9cd8070c509fe02ab5682c028e | commitdiff |
r5283: Merge -r5279 and-r5280 from trunk.
(This used to be commit 74d872287b5cf5b13512091827a9d065f1fef122)
(This used to be commit 74d872287b5cf5b13512091827a9d065f1fef122)