From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 28 Jan 2008 15:06:05 +0000 (+0000)
Subject: merge of 'd13e860cc99eb6e7165589bb5b3efcdc273ae032'
X-Git-Tag: Release-2010-05/1~7829^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1c5c1c76a4f7077b7ebebbc9d663907fe48ff23;p=openembedded.git

Merge ... 'd13e860cc99eb6e7165589bb5b3efcdc273ae032'
     and 'dc89094b528d67f441ec460b0a314a2ff6ccbb98'
---

a1c5c1c76a4f7077b7ebebbc9d663907fe48ff23