From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 16 Mar 2007 22:44:37 +0000 (+0000)
Subject: merge of '1057a7dd4281b008df3336f70c20a7b782601402'
X-Git-Tag: Release-2010-05/1~8868^2~1086^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ca4862fd7a02e1a28e90cdb321342f4b779e36;p=openembedded.git

Merge ... '1057a7dd4281b008df3336f70c20a7b782601402'
     and '8b5079938e203b33211ea242ae28706e1ab24ce8'
---

d9ca4862fd7a02e1a28e90cdb321342f4b779e36