Merge branch 'master' of git://git.samba.org/samba into convenience
commit4903d20c215a01f70c242cb8cf4d455d0e352b7f
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:41:57 +0000 (1 16:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 15:41:57 +0000 (1 16:41 +0100)
tree75e0ff6c58546ee4e1d68d3b677c7c75e56fcb68
parent9f6e2d64852026d118c717d80236177fd74331eb
parent09ac816b36e45fd537af2f7fe7c57a11f5c744f5
Merge branch 'master' of git://git.samba.org/samba into convenience