From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 1 Sep 2007 18:44:16 +0000 (+0000)
Subject: merge of 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
X-Git-Tag: Release-2010-05/1~8751
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce0154bcbbb6ed2bd30d2ee204630ea98dd9b69;p=openembedded.git

Merge ... 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
     and 'ed77cd74b64e0454761e99d7c3b09c39ef2a97a9'
---

5ce0154bcbbb6ed2bd30d2ee204630ea98dd9b69