From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 7 Feb 2006 02:45:14 +0000 (+0000)
Subject: merge of 53837b57b14a20c51df704090e14559b1bb45c2e
X-Git-Tag: Release-2010-05/1~9453^2~2418^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fc48e94ff44f6bcd110ed16c53e0e2a589c689f;p=openembedded.git

merge of 53837b57b14a20c51df704090e14559b1bb45c2e
     and db44099923569a202d14953cbddea82c0547ccb1
---

4fc48e94ff44f6bcd110ed16c53e0e2a589c689f