Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 00:04:42 +0000 (20:04 -0400)
committerSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 00:04:42 +0000 (20:04 -0400)
commit7e4de49bfceed18c81abf93703a61d0a22617a24
tree37b74b75d0edcfe28ce4d9898c0889a74b262492
parent378e4d5b8d30733f0f28cc2bceb28d9b9b594707
parent27aece72004a84a6e0b2e00987d8a362e307d1d8
Merge branch 'master' of ssh://git.samba.org/data/git/samba