From: Koen Kooi <koen@openembedded.org>
Date: Sat, 5 Aug 2006 19:50:54 +0000 (+0000)
Subject: merge of '2ca01af51f12b07b28c6a80e57347d82f7122780'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~20^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a3ad4715faf8adc906eb394d1c242033c3944fa;p=openembedded.git

Merge ... '2ca01af51f12b07b28c6a80e57347d82f7122780'
     and '7f3bc3b8600afa9c810238b8d5a88ec7a80c6c9a'
---

7a3ad4715faf8adc906eb394d1c242033c3944fa