From: Jamie Lenehan <lenehan@twibble.org>
Date: Sat, 18 Aug 2007 11:54:50 +0000 (+0000)
Subject: merge of '398bc51e114a5414e2a0ed00059e3e98a2c10bba'
X-Git-Tag: Release-2010-05/1~8923
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3e31462e6afd26fa15f75e9c8df0ac80333806;p=openembedded.git

Merge ... '398bc51e114a5414e2a0ed00059e3e98a2c10bba'
     and '5422e2398ee185cee0c5489c142e459d793486a3'
---

6b3e31462e6afd26fa15f75e9c8df0ac80333806