From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 2 Dec 2005 16:54:17 +0000 (+0000)
Subject: merge of 542f6b46587305352d62fe667186ce8ecb2b961f
X-Git-Tag: Release-2010-05/1~9453^2~2985^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d416cca1e8d5b1f1a3f1e82dd2d495f34582bd41;p=openembedded.git

merge of 542f6b46587305352d62fe667186ce8ecb2b961f
     and abdb3c1396c6a41a9593637725c84bf2db2acdb0
---

d416cca1e8d5b1f1a3f1e82dd2d495f34582bd41