From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 30 Mar 2007 16:18:39 +0000 (+0000)
Subject: merge of '0f8135c65473df463f2188fa0dfa768a14732485'
X-Git-Tag: Release-2010-05/1~8868^2~887
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8707920ac505691fcfd99d3892098b297b2022a3;p=openembedded.git

Merge ... '0f8135c65473df463f2188fa0dfa768a14732485'
     and '4583e7735dbb33cb243e9f3b88e60543e00521e3'
---

8707920ac505691fcfd99d3892098b297b2022a3