From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 14 Aug 2005 22:49:22 +0000 (+0000)
Subject: merge of 53c5b2e873bb0b8ea06a56684f9d488fc043c3b2
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3161ca09f01c8543b6b97183989be96d00ffb62f;p=openembedded.git

merge of 53c5b2e873bb0b8ea06a56684f9d488fc043c3b2
     and e6e39921b062d03c77147b22e3d7394bdb39a97d
---

3161ca09f01c8543b6b97183989be96d00ffb62f