Commit 55f693a80ceaa62fd71064ef02f70fadcf56eaeb

ckolivas 2012-02-04T09:59:20

Revert Makefile.am component for easier merge of upcoming changes.