Merge branch 'master' of git://git.samba.org/samba into convenience
authorJelmer Vernooij <jelmer@samba.org>
Mon, 2 Mar 2009 03:15:11 +0000 (04:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 2 Mar 2009 03:15:11 +0000 (04:15 +0100)
commit2d7a3748b2063c4137ee98ceca85361651ef8ee7
tree2fd585a487b3d4af7056022bbf02c61910fe92c6
parentc7b9757b8ac3ac6baa478655a4d2f77dff8240a8
parent9b0df441e1bd836c433e11582650fa0171791485
Merge branch 'master' of git://git.samba.org/samba into convenience