From: Jamie Lenehan <lenehan@twibble.org>
Date: Sat, 18 Aug 2007 11:20:49 +0000 (+0000)
Subject: merge of '06538476a57a7ec542febb49515ebf5c936fe6de'
X-Git-Tag: Release-2010-05/1~8924^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80b8c18df2b36fa0ba5c0731a15eb40ff502908;p=openembedded.git

Merge ... '06538476a57a7ec542febb49515ebf5c936fe6de'
     and '930c3cb990617ba61f08fd6fc4371224b675d4ab'
---

c80b8c18df2b36fa0ba5c0731a15eb40ff502908