From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 2 Aug 2005 12:51:42 +0000 (+0000)
Subject: merge of 0aca9d0e2aa3168844a8528e8e1d0defa5d0d375
X-Git-Tag: Release-2010-05/1~9453^2~4011^2~4^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1df842080b8c261987fe026cf680a2b432aec63;p=openembedded.git

merge of 0aca9d0e2aa3168844a8528e8e1d0defa5d0d375
     and bceb17b4b3f7ad3dba819f052a106e966cb08d89
---

f1df842080b8c261987fe026cf680a2b432aec63