Merging in Chee Seng's branch where he fixed the problems that arose when we have Matchers extends Inspectors.
Cmd I used:

svn merge -r4855:HEAD https://scalatest.googlecode.com/svn/branches/cs-matchers-2


git-svn-id: http://scalatest.googlecode.com/svn/trunk@4858 fd1274fd-080f-5963-8033-43ee40fcd1de