8 Commits

Author	SHA1	Message	Date
Jelmer Vernooij	19ab776bf9	sync 3_0 branch with HEAD	0001-01-01 00:00:00 +00:00
Gerald Carter	e8ede079b5	merging some changes from SAMBA_2_2	0001-01-01 00:00:00 +00:00
Gerald Carter	bb574aab8f	merge from 2.2	0001-01-01 00:00:00 +00:00
Gerald Carter	46bd77a02a	fixes from 2,2	0001-01-01 00:00:00 +00:00
Gerald Carter	3d4adad150	sync up comments with 2.2	0001-01-01 00:00:00 +00:00
Gerald Carter	9e3b432c57	sync with 2.2	0001-01-01 00:00:00 +00:00
Gerald Carter	241b5218ea	merge from 2.2	0001-01-01 00:00:00 +00:00
Gerald Carter	aca58b0b72	sync with 2.2	0001-01-01 00:00:00 +00:00