Merging in my bv-outcomes branch into trunk. Command I used:

svn merge -r5172:HEAD https://scalatest.googlecode.com/svn/branches/bv-outcomes


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