Merge commit 'refs/changes/68/168/2' of git://egit.eclipse.org/egit
commit3368871375619a4da06cafb2131b1d14996a8234
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Wed, 30 Dec 2009 15:44:01 +0000 (30 16:44 +0100)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Wed, 30 Dec 2009 15:44:01 +0000 (30 16:44 +0100)
tree7b001cd704be7e4a79652c0e9bf0f61e63709916
parentd8b69fa7481c85682aa017b31656eacdf4573cfe
parentc14a017aff2bd4ff8ed9ded4daf6f72d542c756c
Merge commit 'refs/changes/68/168/2' of git://egit.eclipse.org/egit

Conflicts:
org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java