tree 5f0b41962fe6d50088f6dffaa0ebbc4e1a983ae1
parent e93aed4b561b94bcaf156655b1e0c296a9120bf3
parent 184a73025f85db1cf376f79e620c2fb0ad02379a
author Jonathan Hart <jono@onlab.us> 1386464901 -0800
committer Jonathan Hart <jono@onlab.us> 1386464901 -0800

Merge in latest code from master and fix conflicts