From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 30 Jul 2005 17:46:49 +0000 (+0000)
Subject: merge of 5f2c5f5ba72b4c3cfbe728107dd0158e960cf154
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~31
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e9f8dcb5e5a9a79133fa4698371407d9274d06e;p=openembedded.git

merge of 5f2c5f5ba72b4c3cfbe728107dd0158e960cf154
     and 652a4835aedfa3b630066ce1f9aaa47035a090e9
---

2e9f8dcb5e5a9a79133fa4698371407d9274d06e