From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 16 Jan 2006 19:42:59 +0000 (+0000)
Subject: merge of 37095a40659e7e7112038308d6b630bd7a258bd5
X-Git-Tag: Release-2010-05/1~9453^2~2634^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e012cd023b2ef139806a58bf67110b9c4f1abb;p=openembedded.git

merge of 37095a40659e7e7112038308d6b630bd7a258bd5
     and e588b97112ee40d0ed224469b12043a82ffb1366
---

18e012cd023b2ef139806a58bf67110b9c4f1abb