From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 10 Jan 2006 03:24:12 +0000 (+0000)
Subject: merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2427fe5ac44f39555ca3b1fee8e0a234917cbe96;p=openembedded.git

merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
     and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49
---

2427fe5ac44f39555ca3b1fee8e0a234917cbe96