Third merge from Julia Longtin repository
commit8cec9db0cce8a2e71658aa0fa5ebbdc444abce50
authorbradymiller <bradymiller@users.sourceforge.net>
Mon, 11 Feb 2013 08:07:22 +0000 (11 00:07 -0800)
committerbradymiller <bradymiller@users.sourceforge.net>
Mon, 11 Feb 2013 08:07:22 +0000 (11 00:07 -0800)
treeffd92394d0511267e8e32b060ff3ca9fcea23939
parente904c8aafde0bef90845e0424cef77e876638f08
parent3fb167751e6f2c5a017c968552add25885a80346
Third merge from Julia Longtin repository