Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 14 Apr 2010 13:38:05 +0000 (23:38 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 14 Apr 2010 13:38:05 +0000 (23:38 +1000)
commitbcd647f943e391bdb98233c168d2b35e244e2bf4
tree5653bdbee1b174ff77b059d9f4a296072e32313f
parente81e057b6d70d70616132593dc2acbfe77cb459c
parentbc6a43aeb41fc5ccf3a34f2ec91e1328ae82d90e
Merge branch 'master' of ssh://git.samba.org/data/git/samba