In case we want one for gtest, but should probably play by the rules...
Merge commit 'c686561150ef4a76d4dff038d514240abe70a3cf'
Moved gtest to correct folder.
Changed name of gtest.
This is the *working* version of google-test (renamed gtest) for mavericks (should compile fine on ML as well)
Added conflicts: google-test.
Merge branch 'master' of https://repository.antcenter.net/scm/uvan/ros-macports

Conflicts:
	patched_macports/ros-gtest/Portfile
Fixed broken merge.
Updated ports with latest generation scripts.