From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 23 Sep 2005 00:36:12 +0000 (+0000)
Subject: merge of 31e4b6a6f2954655d18e0e65341dbd7053995cec
X-Git-Tag: Release-2010-05/1~9453^2~3453
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883b71600a2b3b456c73c644c8d5f3bba21e0d01;p=openembedded.git

merge of 31e4b6a6f2954655d18e0e65341dbd7053995cec
     and 68ad04146d2caa3296187babd7b1ea4128dac5f1
---

883b71600a2b3b456c73c644c8d5f3bba21e0d01