On 2014-02-10 13:54, Holger Levsen wrote: > Hi, > > except that there is a merge conflict now :( Cannot reproduce. Anyway, rebased everything on your cherry-picks and both are now in for-holger Andreas