From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 31 Jul 2005 14:27:01 +0000 (+0000)
Subject: merge of 100af48176006080bc6eaf59f5e30c1da29c86c3
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52282efd0d8ae7cfc33824301afc80af9ba1c22;p=openembedded.git

merge of 100af48176006080bc6eaf59f5e30c1da29c86c3
     and 17e420c5e347fcd369eb9354898c3e5ef2d059c6
---

a52282efd0d8ae7cfc33824301afc80af9ba1c22