From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 30 Jan 2006 00:21:37 +0000 (+0000)
Subject: merge of 45de09dab54a555a9dcd180a4903909773cf34d2
X-Git-Tag: Release-2010-05/1~9453^2~2505
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d147900a4c35dd78cebf1349e7912554a2a5f59f;p=openembedded.git

merge of 45de09dab54a555a9dcd180a4903909773cf34d2
     and e4d8da41e5409080382f7a87c16b20bcc29516e3
---

d147900a4c35dd78cebf1349e7912554a2a5f59f