Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit6ffe233f9442792a0e8e52167a01b76eabd83be9
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 16:27:41 +0000 (18 17:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 16:27:41 +0000 (18 17:27 +0100)
tree37a461845d9395c2290bbde73c3c7f95a7d3a37f
parentbfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b
parent0dbd3968626445b4dcb00307e45206b37dd0e8ad
Merge branch 'master' of ssh://git.samba.org/data/git/samba