Merge branch 'master' of ssh://git.samba.org/data/git/samba
commitf9f3358348229b14d368316e327cfd2a4cb48c7c
authorSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 17:48:31 +0000 (19 13:48 -0400)
committerSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 17:48:31 +0000 (19 13:48 -0400)
tree9fb61c2ed61dd1ff93a64fc4498a4ec8d3a0607d
parent7e4de49bfceed18c81abf93703a61d0a22617a24
parent630a2eb68af0d523a1bb4451bbaa75d2ba47d252
Merge branch 'master' of ssh://git.samba.org/data/git/samba