From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 15 Mar 2007 11:22:19 +0000 (+0000)
Subject: merge of 'ecad2d6a0192a40606d0b6ee2164ef2e95cbd263'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~8^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e0454c007a7237b5e12d2b628495d3329ec2acb;p=openembedded.git

Merge ... 'ecad2d6a0192a40606d0b6ee2164ef2e95cbd263'
     and 'f0ac883131dac02c3bdb6f69f376ce628a575a95'
---

9e0454c007a7237b5e12d2b628495d3329ec2acb