From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 May 2006 17:22:56 +0000 (+0000)
Subject: merge of 7b99c91d607aaec886913e28b8d90df3ea56d5d9
X-Git-Tag: Release-2010-05/1~9453^2~1665^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b203c31021eaecc7750b1e670472b97777f0511b;p=openembedded.git

merge of 7b99c91d607aaec886913e28b8d90df3ea56d5d9
     and d9c4abd064b8662fdf4ba0a5e24699fc89ce51f3
---

b203c31021eaecc7750b1e670472b97777f0511b