From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 11 Sep 2006 08:26:55 +0000 (+0000)
Subject: merge of '9f9af081d35c83fb9fcf3d0378dbc38579858171'
X-Git-Tag: Release-2010-05/1~9453^2~843^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=823fa0c0f4c3d4de7d6db5badd686d9e441d39ff;p=openembedded.git

Merge ... '9f9af081d35c83fb9fcf3d0378dbc38579858171'
     and 'd2e1959c4d2d8f9a070ee5db2eedd636d8dc687d'
---

823fa0c0f4c3d4de7d6db5badd686d9e441d39ff