From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 21 Jan 2006 05:54:52 +0000 (+0000)
Subject: merge of c495c19159f4a954f2b8e7b6ecd3c1e60fbf15df
X-Git-Tag: Release-2010-05/1~9453^2~2605
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325e11a718cf09f9df860effc16b6c22de6e01a2;p=openembedded.git

merge of c495c19159f4a954f2b8e7b6ecd3c1e60fbf15df
     and def6c51e33aca81d009da117feae54ed9217310e
---

325e11a718cf09f9df860effc16b6c22de6e01a2