Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 30 Oct 2008 22:29:14 +0000 (23:29 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 30 Oct 2008 22:29:14 +0000 (23:29 +0100)
commit6acd90998803c28fa12ff0d1f47056c64b7d8d8d
tree11d0df3327f71e02cecafd79ec98af0fd2409438
parent0ab0373a97114b2911ed5f38e3548676f196a2c0
parent782f309df35cba41c9e5b65db242b961bacbbf87
Merge branch 'master' of git://git.samba.org/samba