DESCRIPTION

Merge: provide user feedback

After merge, the user should get feedback about
what happened.

Signed-off-by: Willow Cantrell xxx@xxx.xxx

COMMENTS

author: Carlie Harper
date: 2010-07-02 14:25:01.000000000

Patch Set 1: Looks good to me, approved; IP review completed



-------------------------------------
author: Gerrit Johnathan Pham
date: 2010-07-02 14:25:02.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

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