From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Aug 2006 14:39:41 +0000 (+0000)
Subject: merge of 'ab20bf4ac663aeb2ac1f0fd51955d412dabfe7c5'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~9^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a46fd09aa4d7988cd9e60d15af4bd8a96df2e9;p=openembedded.git

Merge ... 'ab20bf4ac663aeb2ac1f0fd51955d412dabfe7c5'
     and 'da07e320252fd12c19a05134932a5efed8d160d5'
---

92a46fd09aa4d7988cd9e60d15af4bd8a96df2e9