Merge remote branch 'random/collab/gmcharlt/egconf12_dev_update'
authorGalen Charlton <gmcharlt@gmail.com>
Sat, 28 Apr 2012 02:13:44 +0000 (22:13 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Sat, 28 Apr 2012 02:13:44 +0000 (22:13 -0400)

Trivial merge