From: Koen Kooi <koen@openembedded.org>
Date: Tue, 5 Sep 2006 08:13:12 +0000 (+0000)
Subject: merge of '5fca8a9235857878b0071b8bbb8836022bc08a23'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad12adb814e3c3b749eae780c45e32047744e429;p=openembedded.git

Merge ... '5fca8a9235857878b0071b8bbb8836022bc08a23'
     and 'b91a2f03f8871b81762acbcf8d524de4970ca8ec'
---

ad12adb814e3c3b749eae780c45e32047744e429