From: Koen Kooi <koen@openembedded.org>
Date: Fri, 25 Aug 2006 10:22:32 +0000 (+0000)
Subject: merge of 'a65c738fddaff369abdad3492d66bdf8f6144220'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~149^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c800d7eca93e36f914679391a8a7961dad4f8b;p=openembedded.git

Merge ... 'a65c738fddaff369abdad3492d66bdf8f6144220'
     and 'c10bc253a7bbce446d6227ef3562f7534d456782'
---

18c800d7eca93e36f914679391a8a7961dad4f8b