Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
commitd8b70278e20b276566a3893d288101ff4826df61
authorAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2009 02:15:53 +0000 (25 13:15 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2009 02:15:53 +0000 (25 13:15 +1100)
tree07ef73d8545fefcdcd9d8867763b1e4439b20aaa
parent7040d94149d8538c0b731b9e62b9b4c7807841b6
parentebe1aa9340d190b2ebcfd2c96f68c7771cccdf01
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel