From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Oct 2006 14:00:49 +0000 (+0000)
Subject: merge of '15b7eadc9952c4f918a8390a157c5b9c400e4394'
X-Git-Tag: Release-2010-05/1~9453^2~567
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5fe7e0d0b6196e8accc54abb29c82daf11615d;p=openembedded.git

Merge ... '15b7eadc9952c4f918a8390a157c5b9c400e4394'
     and '24a92b152eddaf3edef74b529a0c7f06bd5e060c'
---

5a5fe7e0d0b6196e8accc54abb29c82daf11615d