Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 25 Feb 2009 01:33:47 +0000 (17:33 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 25 Feb 2009 01:33:47 +0000 (17:33 -0800)
commitf68c09110776c1cdeb83d16a660081e6be0c89ed
treed3d2088ead8db0fb101c5185ca7f7bb462f075b8
parentcde5724780c0e52705e0f6e7cd41e0c884afbb40
parentaeab22b55cb1484ff6da7242bd525e30b69e5752
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba