On Fri, Jun 8, 2012 at 10:21 AM, Koen Kooi <koen at dominion.thruhere.net> wrote: > It gave me a merge conflict, can you try to rebase it onto the current HEAD > of meta-oe please? Done - can you give it another try? Andreas