Second merge from Julia Longtin repository
authorbradymiller <bradymiller@users.sourceforge.net>
Fri, 8 Feb 2013 19:18:52 +0000 (8 11:18 -0800)
committerbradymiller <bradymiller@users.sourceforge.net>
Fri, 8 Feb 2013 19:18:52 +0000 (8 11:18 -0800)

Trivial merge