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)
Conflicts:
librpc/ndr.pc.in


Trivial merge