From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 13 Mar 2007 18:00:45 +0000 (+0000)
Subject: merge of '01f61c60289e6d5d11ca99200e7cac4d1ad5f8fe'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~17^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927b60e7ff7e7e40e010911dba02891eca3fd1ed;p=openembedded.git

Merge ... '01f61c60289e6d5d11ca99200e7cac4d1ad5f8fe'
     and '50e88f321fa8581fb3e6e39b6449fa5bc250be8d'
---

927b60e7ff7e7e40e010911dba02891eca3fd1ed