From: Koen Kooi <koen@openembedded.org>
Date: Wed, 13 Sep 2006 21:06:36 +0000 (+0000)
Subject: merge of '5b517db465e78171fe40e917eed17ab8594b1423'
X-Git-Tag: Release-2010-05/1~9453^2~827
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4125924de0480c8ed9723fef6825b8bd89528be7;p=openembedded.git

Merge ... '5b517db465e78171fe40e917eed17ab8594b1423'
     and 'ffa337dbaac9ce437c92c6e2b6e0d8f6f8186bfc'
---

4125924de0480c8ed9723fef6825b8bd89528be7