Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 01:39:56 +0000 (03:39 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 01:39:56 +0000 (03:39 +0200)
commit396e53f9ffbaf1a70d2ffe327b3da56e24e62e17
tree299623dd624a2cbd81603aa8b2e850deaf59933e
parent606c398fb834c3e057423dfce641b8a6b2d3f925
parente11277e28db19841e941c62478d99d3780cd238b
Merge branch 'master' of git://git.samba.org/samba