From: Koen Kooi <koen@openembedded.org>
Date: Thu, 27 Jul 2006 10:19:09 +0000 (+0000)
Subject: merge of '424953790319440fd6f6ed53f7e06225ac29f8df'
X-Git-Tag: Release-2010-05/1~9453^2~1087
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e25e30f9b39600d8911dcda9116d8d665e508e79;p=openembedded.git

Merge ... '424953790319440fd6f6ed53f7e06225ac29f8df'
     and '9f101a66008e48dcb6c74d97567cb656101bd8a0'
---

e25e30f9b39600d8911dcda9116d8d665e508e79