Merge proposals dependent on lp://qastaging/~rr.clearcorp/openerp-ccorp-trainings/2012-06-ctp-technical-costa-rica

1. 2012-06-ctp-technical-costa-rica
2. Dependent merge proposals