From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 20 Nov 2006 22:56:14 +0000 (+0000)
Subject: merge of 'f8321aa1642750ba69f345b7dc42a76e54b38109'
X-Git-Tag: Release-2010-05/1~9453^2~375
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a093dc8bfcacfe3bacb03b20a98275f2eb4dc6;p=openembedded.git

Merge ... 'f8321aa1642750ba69f345b7dc42a76e54b38109'
     and 'f9166f330098ae8267ad73a30c5feb67558b7cdb'
---

e3a093dc8bfcacfe3bacb03b20a98275f2eb4dc6