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


Trivial merge