From: Derek Young <dyoung@nslu2-linux.org>
Date: Wed, 7 Sep 2005 20:15:56 +0000 (+0000)
Subject: merge of 0e717bbdf4b51eb5e38424e61b118ac408fe5dbb
X-Git-Tag: Release-2010-05/1~9453^2~3589^2^2~1^2~1^2~2^2^2~4^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fe65945adf12e96c0036212ad9bcb7a0578d078;p=openembedded.git

merge of 0e717bbdf4b51eb5e38424e61b118ac408fe5dbb
     and f7df54703e89d2fcf70786569158e88ba65e2ef0
---

5fe65945adf12e96c0036212ad9bcb7a0578d078