Originally committed to SVN as r1139.
And final commit in Makefile.am updates for now... I hope. Originally committed to SVN as r1135.
Originally committed to SVN as r1133.