Merge branch 'master' of git://git.samba.org/samba into convenience
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:29:04 +0000 (17:29 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:29:04 +0000 (17:29 +0100)
commitbbe2d30f66ebd8537203870b1225179f03d42744
tree279b1d4d45bdcc69002565a52179c454460f39f0
parent4903d20c215a01f70c242cb8cf4d455d0e352b7f
parent08b180e40e5179cc02d4aa1867d5063f47b85790
Merge branch 'master' of git://git.samba.org/samba into convenience