From: Koen Kooi <koen@openembedded.org>
Date: Wed, 6 Sep 2006 10:37:33 +0000 (+0000)
Subject: merge of '0cc400441946f7a721b718fe50f7bbce5c9ea24f'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~47
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80788791c0a9475d9e2ee6c8f39f283584a7f15c;p=openembedded.git

Merge ... '0cc400441946f7a721b718fe50f7bbce5c9ea24f'
     and '42be14012b6790df46c62295f3a02286acecbd4f'
---

80788791c0a9475d9e2ee6c8f39f283584a7f15c