Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
commitd6e801b7d9a666d40f109df20dff0faaa2b46e70
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 Jan 2009 02:39:54 +0000 (19 13:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 19 Jan 2009 02:39:54 +0000 (19 13:39 +1100)
tree77d5e6ac67825eca5b8c970f6bfba95d8002f024
parent9fa6fb3d9fb2e4cee81ad34d6fd0cbe6f5265171
parentfe9dd8710d577478b324d1d507de0ecd77df2ea5
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel