Merge "Don't inadvertantly include tests in the build." into kraken
Steve Howard [Mon, 21 Jun 2010 22:54:16 +0000 (15:54 -0700)]

Trivial merge