Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Mon, 4 Jan 2010 09:24:10 +0000 (11:24 +0200)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Mon, 4 Jan 2010 09:24:10 +0000 (11:24 +0200)
commitfb5383c69ee52fb5e6d066a43451dc8c806cc795
tree45b72e03f68ab6d212755c524f8e8a60a3b4373a
parent60d8ab3b7b0bd2c9b633f0380d1fdf5bcf5e2621
parenta06e5cdb99ddf7abf16486d3837105ec4e0da9ee
Merge branch 'master' of git://git.samba.org/samba