Committed r1009
W: a0a5dec10e5fa42fd64e4b9ddaceb148d96cc525 and refs/remotes/trunk differ, using rebase:
:040000 040000 107e0b7423c7f4b5d4d2b6484c55581b0694c695 3189f760cedd7592adb20d95543f3568150d8b8e M	db
Current branch master is up to date.
# of revisions changed
before:
69d5de13620409b86d4e1129e12ebb017f76c287

after:
a0a5dec10e5fa42fd64e4b9ddaceb148d96cc525
69d5de13620409b86d4e1129e12ebb017f76c287
If you are attempting to commit merges, try running:
	git rebase --interactive--preserve-merges refs/remotes/trunk