From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 3 Feb 2006 18:59:05 +0000 (+0000)
Subject: merge of 883e320e9096e9d226b4afb571bc0438af7de629
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c02bc02736aad32e38b413bc8e7de9dc69bdaa1;p=openembedded.git

merge of 883e320e9096e9d226b4afb571bc0438af7de629
     and a5d19c10f69d3e208c0ae13271dd3e70b219f1aa
---

7c02bc02736aad32e38b413bc8e7de9dc69bdaa1