From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Nov 2006 15:12:07 +0000 (+0000)
Subject: merge of '0c89fbedbb59ef7e1b229b833813e59080b4952a'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49a826fff67c6597b5b7c197a4998bafd4c3c8a0;p=openembedded.git

Merge ... '0c89fbedbb59ef7e1b229b833813e59080b4952a'
     and '3fcc18f194a4f1bcbe8cb8c4a82dc5c59d63eaf1'
---

49a826fff67c6597b5b7c197a4998bafd4c3c8a0