Merge branch 'release/release-1.2'
authorJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:36:37 +0000 (18:36 -0800)
committerJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:36:37 +0000 (18:36 -0800)
General cleanup, plus support USR1 status reporting.


Trivial merge