Merge branch 'topic/usage_exit_not_die'
Karen Etheridge [Sun, 15 Apr 2012 01:39:00 +0000 (18:39 -0700)]

Trivial merge