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