Merge from Julia Longtin repository
commit3909f5d5a84f4aaeb288a7094f2577771c824635
authorbradymiller <bradymiller@users.sourceforge.net>
Wed, 6 Feb 2013 23:45:48 +0000 (6 15:45 -0800)
committerbradymiller <bradymiller@users.sourceforge.net>
Wed, 6 Feb 2013 23:45:48 +0000 (6 15:45 -0800)
tree18e34e6c7daa2ffb6439512ac37c087775c9c63c
parentd3e27ddb66dae3a8bf2c60817ed69c330fc3f61b
parent79780fe3cbf7fed3a116144abbc6df1849c0ecb0
Merge from Julia Longtin repository