Merge remote-tracking branch 'eg-working/collab/phasefx/merged_bill_and_receipt_fixes'
authorMike Rylander <mrylander@gmail.com>
Tue, 15 Nov 2011 20:36:26 +0000 (15:36 -0500)
committerMike Rylander <mrylander@gmail.com>
Tue, 15 Nov 2011 20:36:26 +0000 (15:36 -0500)

Trivial merge