Merge branch 'master' of git://git.samba.org/samba into teventfix
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:39:35 +0000 (16:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:39:35 +0000 (16:39 +0100)
commit09ac816b36e45fd537af2f7fe7c57a11f5c744f5
tree4d5d44c27a2395a39efc62359f6e4b6976f2ba2e
parent235244f4cc707130dd130afce88bde49606bd501
parent54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
Merge branch 'master' of git://git.samba.org/samba into teventfix

Conflicts:
lib/tevent/pytevent.c