From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 14 Aug 2005 23:03:05 +0000 (+0000)
Subject: merge of 0856e0c924897487f6fe46a20c85d346215d0090
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b08711364c1884e13149ec231a1e174d2197a31;p=openembedded.git

merge of 0856e0c924897487f6fe46a20c85d346215d0090
     and ef312c48edbba5ce136474d6aef3ac78400707b7
---

0b08711364c1884e13149ec231a1e174d2197a31