Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 20:51:18 +0000 (12:51 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 20:51:18 +0000 (12:51 -0800)
commite000045f15665f1c5209f52bf5730bac5c14256b
treebb72078d66fae6c8b854129ba0abd92afd279757
parent3d2d0203e57bacf0cd61cfb72780a4bd9aa42707
parent793f1cdbd918f2245255176572027763664d9d0b
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba