am 48e3e617: am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some...
Jeff Hamilton [Sat, 29 Jan 2011 17:00:27 +0000 (09:00 -0800)]
* commit '48e3e617b6a74f79f655cd97d09a82e316d1e2ef':
  Don't crash when not selecting a contact. Fix some more UI stuff. Add text type.


Trivial merge