From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Aug 2006 10:38:21 +0000 (+0000)
Subject: merge of '73a0fd7a86c83ccf1f4ef3268b3d5af71f74a60a'
X-Git-Tag: Release-2010-05/1~9453^2~961
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5240bd311339bb7ebfe9ef7e30f17475e9e2be8c;p=openembedded.git

Merge ... '73a0fd7a86c83ccf1f4ef3268b3d5af71f74a60a'
     and 'cca0d62f63238636b31f2f73cf7d30fce2b62e84'
---

5240bd311339bb7ebfe9ef7e30f17475e9e2be8c