From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 14 Mar 2006 22:34:13 +0000 (+0000)
Subject: merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c
X-Git-Tag: Release-2010-05/1~9453^2~2233
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e47d0f0ad0f9903550c50fdb59f773ee0b76ab6;p=openembedded.git

merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c
     and 27b9c5adc9f3c8d43d5702469feb4aef564a14c4
---

9e47d0f0ad0f9903550c50fdb59f773ee0b76ab6