From: Koen Kooi <koen@openembedded.org>
Date: Wed, 4 Oct 2006 13:23:00 +0000 (+0000)
Subject: merge of '223327fd3033fa458005719c617ffb6c13746e86'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844f7ef25e0634ed47e6e0a5f28ff9813a0518d8;p=openembedded.git

Merge ... '223327fd3033fa458005719c617ffb6c13746e86'
     and 'ce63e148eb0ac86cb7f827f18f543498d1950b15'
---

844f7ef25e0634ed47e6e0a5f28ff9813a0518d8