From: Koen Kooi <koen@openembedded.org>
Date: Tue, 6 Mar 2007 10:24:58 +0000 (+0000)
Subject: merge of '6466dc79dded8ec3ade8c212b27f84f9699f48e1'
X-Git-Tag: Release-2010-05/1~9088^2^2^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76fb5fea94809a4c14a723d192667eaf2bb0b86f;p=openembedded.git

Merge ... '6466dc79dded8ec3ade8c212b27f84f9699f48e1'
     and '692c2b51db3e49bf51daec9a4656898cf8994fff'
---

76fb5fea94809a4c14a723d192667eaf2bb0b86f