Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Tue, 15 Sep 2009 18:48:23 +0000 (11:48 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 15 Sep 2009 18:48:23 +0000 (11:48 -0700)
commitdac0fb0b7c369255e0d07e47a11f6a0288019da1
tree63b513e26972b3c5286a015b6dc110b4b20b1305
parentefe9f952504a5a3114cada5f0caed315c4bc654d
parente44c4141fdfa07bb3bd09f28e5f093d27f170dc8
Merge branch 'master' of /home/tridge/samba/git/combined