From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 30 Apr 2007 04:06:45 +0000 (+0000)
Subject: merge of 'cb611997ee14f51bf6877589c7d518d35ed52f50'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~3^2~13^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e24dc2b20fb661b1d804d180b3d0901e1254e679;p=openembedded.git

Merge ... 'cb611997ee14f51bf6877589c7d518d35ed52f50'
     and 'e1f2e3537870e6d4a997727168dd4b5fc7824f14'
---

e24dc2b20fb661b1d804d180b3d0901e1254e679