From: Koen Kooi <koen@openembedded.org>
Date: Wed, 25 Oct 2006 19:44:38 +0000 (+0000)
Subject: merge of '5a26245df5a73c8d0bf8f987e469566f6955e6cf'
X-Git-Tag: Release-2010-05/1~9453^2~581^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da570019e7b647998eef24506a6868169f4b242;p=openembedded.git

Merge ... '5a26245df5a73c8d0bf8f987e469566f6955e6cf'
     and 'a6b55df21b68c18274ec3a7e51a4a8fb1f75ea3f'
---

0da570019e7b647998eef24506a6868169f4b242