From: Phil Blundell <philb@gnu.org>
Date: Sat, 26 Jul 2008 16:22:42 +0000 (+0000)
Subject: merge of 'd11de5b2fccb6699a3ba660836048f87dc676a4c'
X-Git-Tag: Release-2010-05/1~6468
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e9d221edf100e3c54630d1214ae85840d75925c;p=openembedded.git

Merge ... 'd11de5b2fccb6699a3ba660836048f87dc676a4c'
     and 'ee301efdfcf7c1a68f66c22997f3d9b52647f25c'
---

5e9d221edf100e3c54630d1214ae85840d75925c