From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Nov 2005 13:43:20 +0000 (+0000)
Subject: merge of 2aabdd81a27bbf17ccee6c78a6e49d74e5a9719f
X-Git-Tag: Release-2010-05/1~9453^2~3120
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa96cbd76be8b084d7fef1c976dc48dc97d2ca77;p=openembedded.git

merge of 2aabdd81a27bbf17ccee6c78a6e49d74e5a9719f
     and ad628b53bae19dc9cca0f00722bde77ec3e339b4
---

fa96cbd76be8b084d7fef1c976dc48dc97d2ca77