From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 9 Mar 2007 21:41:32 +0000 (+0000)
Subject: merge of '9b590c455ec18081740ff67b970076675bf4220c'
X-Git-Tag: Release-2010-05/1~8868^2~1121^2^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01867b9caa2d6823dc61920988100d5801fce84;p=openembedded.git

Merge ... '9b590c455ec18081740ff67b970076675bf4220c'
     and 'd02e88de133625c48c0dfeb0ebe1c942b3bb7dcf'
---

f01867b9caa2d6823dc61920988100d5801fce84