Initial commit from https://logmaster.googlecode.com/svn/trunk/