Merge recent changes
[gigfinder] / src / usr /
2010-05-16 JonUpdate structure to include the build