From: Derek Young <dyoung@nslu2-linux.org>
Date: Sat, 17 Sep 2005 13:09:25 +0000 (+0000)
Subject: merge of 18e90deffbe7500d559fd5a3e6ad96258087772b
X-Git-Tag: Release-2010-05/1~9453^2~3507
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e879aac21b73889c0f3c86760099ffcf45ad7bc0;p=openembedded.git

merge of 18e90deffbe7500d559fd5a3e6ad96258087772b
     and 597b1f057c7b7f29333d19ebf0b1c777db0569a9
---

e879aac21b73889c0f3c86760099ffcf45ad7bc0