DESCRIPTION

Fixed broken get and touch test

I was testing these throuh eclipse before and I didn't have
assertions turned on so I falsely verifed the last commit that I
checked in.

Change-Id: I01ca86771041b13e63f5073193eb3c49ed2947c9


COMMENTS

author: Kenny Maynard
date: 2011-06-16 00:23:19.463000000

Patch Set 1: Verified



-------------------------------------
author: Andreas Short
date: 2011-06-17 19:07:04.053000000

Patch Set 1: Looks good to me, approved



-------------------------------------
author: Tate Garrett
date: 2011-06-17 19:07:04.247000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
