From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 02:05:26 +0000 (+0000)
Subject: merge of '38a08f997602a09b164ab9864452b19c00f8ceed'
X-Git-Tag: Release-2010-05/1~9453^2~876^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33166e78814f0664ded6d77db75b67b619c0d687;p=openembedded.git

Merge ... '38a08f997602a09b164ab9864452b19c00f8ceed'
     and 'c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a'
---

33166e78814f0664ded6d77db75b67b619c0d687