cleanup after merging the seperate paths
Authored by: mikebeblack 2011-04-09
Parent: [r131]
Child: [r133]