Latest commit 70050af Nov 11, 2012 root Merges boone's commits