Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)
commit39971fff27f71b514308d10d7a2d8c3fb58c2420
tree101f2adac9ef41af17579d22f6ddd56ada62ce5d
parent23676b6e9e8aad0ac2aa78d04e65f637b4551527
parente71d9728f52e969e07927c5b38fa062c6ef6d1eb
Merge branch 'master' of /home/tridge/samba/git/combined