Merge branch 'master' of ssh://git.samba.org/data/git/samba
commitcce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9
authorJelmer Vernooij <jelmer@samba.org>
Mon, 26 Jan 2009 17:14:41 +0000 (26 18:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 26 Jan 2009 17:14:41 +0000 (26 18:14 +0100)
tree62f598c7a01e072cc52d166364bc3d2a94e85242
parentd30b6af9532c0ea4e9610b30d13e7a4d9b763834
parentd8f15e4efc00b9d509ff5761e9ca8ff5c6f443f7
Merge branch 'master' of ssh://git.samba.org/data/git/samba