From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 16 Jan 2006 01:38:20 +0000 (+0000)
Subject: merge of 190ba6d987a58bb9185b18f91b075113f31cbae0
X-Git-Tag: Release-2010-05/1~9453^2~2650^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce5a95818e5574d3fb411614519a219b9aa5c69;p=openembedded.git

merge of 190ba6d987a58bb9185b18f91b075113f31cbae0
     and e28d190b53d034845e4ae2fce2648104676a571b
---

9ce5a95818e5574d3fb411614519a219b9aa5c69