jmattis Initial commit, based on r103 of https://code.google.com/p/vbjin