Commit 02f7f67335f40b39736a06c0451c965014a14c3d

William Pitcock 2011-07-25T00:26:55

main: add some minor stuff