43bc86329a45bab4c81224427fd305eba41cf62f

Author: Jeff Loiselle

Date: 2008-12-23 12:20:11 -0500

Merge branch 'master' of git@thechaw.com:pressmate