Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Feb 2009 15:39:28 +0000 (16:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 5 Feb 2009 15:39:28 +0000 (16:39 +0100)
commit6d139ca4680abcbda5110f2f0886aa038ff62088
tree7d61db40fb058bcbf08ccd8e0dadc365b819371b
parent4a9b3052caeb8bb144803b49dcfae82395172bc3
parentafa960cbbcd609123d710c301e7a9a070c1fed70
Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
librpc/ndr.pc.in