From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 16 May 2008 16:24:50 +0000 (+0000)
Subject: merge of '87aa8e8cdbee54b3d7ff294da220db58798e8c12'
X-Git-Tag: Release-2010-05/1~6928
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af19efb1b5128bfce441029e131dbe6c8a0e8043;p=openembedded.git

Merge ... '87aa8e8cdbee54b3d7ff294da220db58798e8c12'
     and 'a5324bd0638da4faba37d7b92ff362d19510c2fc'
---

af19efb1b5128bfce441029e131dbe6c8a0e8043