From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 11:24:03 +0000 (+0000)
Subject: merge of 'c897b9aae765097d608e7db4e7cd208c40f9ee74'
X-Git-Tag: Release-2010-05/1~8180^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0771afd9627211db59fcde15084512e5fcd1b22;p=openembedded.git

Merge ... 'c897b9aae765097d608e7db4e7cd208c40f9ee74'
     and 'ddac71d079db394f27c2b51f7967ea038d63a347'
---

f0771afd9627211db59fcde15084512e5fcd1b22