b4mboo/trash — pull request #35 by b4mboo (2012-06-11 11:34:20+00:00)
Title: [Review] Request from 'b4mboo' @ 'b4mboo/trash/review_120611_confict_branch'

Please review the following changes: