Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 22 Oct 2008 14:57:46 +0000 (16:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 22 Oct 2008 14:57:46 +0000 (16:57 +0200)
commitc94f994dda494f78f0ffb018632abf75d99b45d6
tree9212b36f093b6a9f7c56135e706d5070464608d4
parent12ad92165eba14a593e0d152fbeda1e8f7d90ef8
parentb8b0274e0351709266dc727d6ee4f857441e5d9e
Merge branch 'master' of ssh://git.samba.org/data/git/samba