Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 21:21:16 +0000 (23:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 21:21:16 +0000 (23:21 +0200)
commit25988f13696547e70b5e3155cb5bcea2f0786312
treea7fec6e89c4ea519b721bd99670bf5743f137e88
parentce0ac322b4a673e59e6e04467b2ceaf7a9637a68
parent8baf1695492300fd8c2ce7e4f106a14f510357e5
Merge branch 'master' of git://git.samba.org/samba