From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 30 Apr 2008 11:00:03 +0000 (+0000)
Subject: merge of '09870e1a9a4da31b62af99557013fa62d824804b'
X-Git-Tag: Release-2010-05/1~7079^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97a1321ef27cb993f15464c2c43e02f81543a401;p=openembedded.git

Merge ... '09870e1a9a4da31b62af99557013fa62d824804b'
     and '4bd2ffe500d3e40adbb648e5d9f65484f4cca99b'
---

97a1321ef27cb993f15464c2c43e02f81543a401