Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 21:49:30 +0000 (22:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 21:49:30 +0000 (22:49 +0100)
commit1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16
tree769f8e097b5225d8627bbb6698106000f226754e
parentebb929779bf9f4aa0cb9695a3ee5ce5d550bcecc
parent8e2b48e1b7c7fd6b6080f2e56f654b682c6426a3
Merge branch 'master' of ssh://git.samba.org/data/git/samba