DESCRIPTION

Merge commit 'refs/changes/61/361/2' of git://egit.eclipse.org/egit into 3612

Conflicts:
	org.eclipse.egit.core/src/org/eclipse/egit/core/CoreText.java
	org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
	org.eclipse.egit.core/src/org/eclipse/egit/core/op/BranchOperation.java
	org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java


COMMENTS

author: Carlie Harper
date: 2010-04-01 11:52:29.000000000

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



-------------------------------------
author: Carlie Harper
date: 2010-04-01 11:54:12.000000000

Patch Set 1: Abandoned

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