Merge in data_nocollide branch. Fixes #6968, improves unit testing framework checks...
authorColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:31:43 +0000 (15:31 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:31:43 +0000 (15:31 -0600)

No differences found