DESCRIPTION

Merge remote branch 'origin/master'

COMMENTS

author: Douglas Trujillo
date: 2011-03-15 22:48:31.000000000

Patch Set 1: I would prefer that you didn't submit this

please rebase this patch series onto origin/master to get rid of this merge commit

-------------------------------------
author: Douglas Trujillo
date: 2011-05-20 21:54:30.000000000

Patch Set 1: Abandoned

this is not required as Iba3b8729 has been rebased

-------------------------------------
