Merge commit 'origin/graw-tests'
authorKeith Whitwell <keithw@vmware.com>
Wed, 19 May 2010 13:04:16 +0000 (14:04 +0100)
committerKeith Whitwell <keithw@vmware.com>
Wed, 19 May 2010 13:04:16 +0000 (14:04 +0100)

Trivial merge