From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sat, 1 Dec 2007 12:28:14 +0000 (+0000)
Subject: merge of '65f2a2de9fd90693f2c33ba07aab5da699166173'
X-Git-Tag: Release-2010-05/1~8247
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f87bd8b648ca8198ae64815aa002d3f3d3e1cf9;p=openembedded.git

Merge ... '65f2a2de9fd90693f2c33ba07aab5da699166173'
     and 'd953a45d03a4cbcd74d92f973ca8c06fe3848355'
---

9f87bd8b648ca8198ae64815aa002d3f3d3e1cf9