[SCM] Samba Shared Repository - branch master updated

[tridge at samba.org]

 > Author: Andrew Tridgell <tridge at samba.org>
 > Date:   Wed Apr 14 23:38:05 2010 +1000
 > 
 >     Merge branch 'master' of ssh://git.samba.org/data/git/samba

sorry, I forgot a --rebase on a git pull