am 1c05a528: am aed3c4a5: am 8fed41c3: Merge "Don\'t inadvertantly include tests...
Steve Howard [Wed, 23 Jun 2010 17:18:26 +0000 (10:18 -0700)]
Merge commit '1c05a52856657fc25c37c508ffe74c18c3ac608c'

* commit '1c05a52856657fc25c37c508ffe74c18c3ac608c':
  Don't inadvertantly include tests in the build.


Trivial merge