From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Tue, 6 May 2008 00:41:48 +0000 (+0000)
Subject: merge of '5c57f792fa4408bfd1d31632734168b1434d7100'
X-Git-Tag: Release-2010-05/1~7019^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c3a71d6bd2a212d89f2f5c7a7c08d16fa3b7511;p=openembedded.git

Merge ... '5c57f792fa4408bfd1d31632734168b1434d7100'
     and 'de01edf0c06eb0cc6e3c6b19195f32bc67519b19'
---

5c3a71d6bd2a212d89f2f5c7a7c08d16fa3b7511