Merge remote branch 'kevmccor/edihistory_3'
authorbradymiller <bradymiller@users.sourceforge.net>
Thu, 15 Nov 2012 01:35:45 +0000 (14 17:35 -0800)
committerbradymiller <bradymiller@users.sourceforge.net>
Thu, 15 Nov 2012 01:35:45 +0000 (14 17:35 -0800)

Trivial merge