From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 1 Dec 2007 22:36:52 +0000 (+0000)
Subject: merge of '80401af978389dc31680f5749d9a6b066bbee542'
X-Git-Tag: Release-2010-05/1~8239^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da116be59a7a608285a0f16da7e9a31566b5ccb;p=openembedded.git

Merge ... '80401af978389dc31680f5749d9a6b066bbee542'
     and 'eb184b297334b4fd07df0787e5149d8be2c97b65'
---

9da116be59a7a608285a0f16da7e9a31566b5ccb