From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Oct 2006 11:17:14 +0000 (+0000)
Subject: merge of '2f5ddd4439353dd39a492ac747a3f655b361c234'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~96^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7000c64fe8dec124cd3ecdd08227c6ee41ee9e7a;p=openembedded.git

Merge ... '2f5ddd4439353dd39a492ac747a3f655b361c234'
     and 'bef23ed01b940f3c5bf62b3bd5e591a33c509ef6'
---

7000c64fe8dec124cd3ecdd08227c6ee41ee9e7a