Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 24 Feb 2009 00:02:45 +0000 (01:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 24 Feb 2009 00:02:45 +0000 (01:02 +0100)
commitfff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf
treeba4bb09fa2c79955c247a637cdd20290a249d960
parentb9cf189404d5ef6b0a2440dc5f9670f0f6d0c131
parent1a9bb33a7db393aff970619f20490e755f0d282b
Merge branch 'master' of ssh://git.samba.org/data/git/samba