Merged from branch
Remove old library that was added through the merge
create directory to merge into trunk
Merged with trunk