From: Derek Young <dyoung@nslu2-linux.org>
Date: Fri, 2 Sep 2005 13:00:50 +0000 (+0000)
Subject: merge of c680327153be372712b73770b77507e942065816
X-Git-Tag: Release-2010-05/1~9453^2~3649^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=811e1f471b6b66bd134c387b5376b00b3bebb739;p=openembedded.git

merge of c680327153be372712b73770b77507e942065816
     and dca105f1fe9254d31ccb9591f46b4c0cefcb2ecd
---

811e1f471b6b66bd134c387b5376b00b3bebb739