From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 22 Jun 2007 18:22:37 +0000 (+0000)
Subject: merge of '3715ba2581395f5be7a350afaaddb444e3568f12'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~28^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8571f7fe1d209f3b14f70d4ccb009122c7308fb1;p=openembedded.git

Merge ... '3715ba2581395f5be7a350afaaddb444e3568f12'
     and 'f2d5a94bba7b716f91c7e2e30b85f8af68b04ae1'
---

8571f7fe1d209f3b14f70d4ccb009122c7308fb1