Stefan Sperling:

> > That merge commit de0fe38 prevents rebasing "master" on "origin/master".
> 
> Does "master" above mean commit 9cd4661 (HEAD -> master)?

Yes.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de