From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 7 Mar 2007 17:32:55 +0000 (+0000)
Subject: merge of '0c12cf6126a10bee7a37d44010488011cec33290'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079480197b5994d8249df626f5acdb3bdf8cf377;p=openembedded.git

Merge ... '0c12cf6126a10bee7a37d44010488011cec33290'
     and 'f52433f8dadd3b7325c2976ace428e6d818efa9c'
---

079480197b5994d8249df626f5acdb3bdf8cf377