6 Commits

Author	SHA1	Message	Date
rMalie	a1bdb7b35e	// Merge -> revision 8507	2011-09-12 16:17:37 +00:00
rMalie	714c65de56	// Merg// Merge -> revision 8395	2011-09-07 16:23:13 +00:00
rMalie	3d89058084	// Merge -> revision 8342	2011-09-05 14:56:02 +00:00
rMalie	c17e7c236d	// MERGE with 1.4 r7770	2011-07-28 09:20:57 +00:00
rMalie	5f6f018885	// REVERT MERGE	2011-07-27 13:35:06 +00:00
rMalie	233c0076b7	// MERGE with trunk revision 7754	2011-07-27 12:48:42 +00:00