From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 02:48:51 +0000 (+0000)
Subject: merge of ffcf1e664e4c623df8d1843978006676812e0bca
X-Git-Tag: Release-2010-05/1~9453^2~2429^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df9021a741b54e4504ba2e639b582b808994a2b4;p=openembedded.git

merge of ffcf1e664e4c623df8d1843978006676812e0bca
     and e1959e48d26e0499e408ad374dceffa4f1055500
---

df9021a741b54e4504ba2e639b582b808994a2b4