DESCRIPTION

Set correct date when committing a merge

The date was not set before. This is corrected with this commit.

A test case was added.

Change-Id: Icd4f750e84a4fb74133b05fdeec57a7faf612547
Signed-off-by: Carlie Harper xxx@xxx.xxx


COMMENTS

author: Willow Cantrell
date: 2010-08-06 15:02:14.000000000

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

Retest ok

-------------------------------------
author: Willow Cantrell
date: 2010-08-06 15:02:15.000000000

Change has been successfully merged into the git repository.

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