From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 14 Jan 2006 04:20:47 +0000 (+0000)
Subject: merge of 46041f133cbc74bb45da74974398099f4df06233
X-Git-Tag: Release-2010-05/1~9453^2~2654^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d4b048f42531eee488f8ddf510371c9eaa0e0c;p=openembedded.git

merge of 46041f133cbc74bb45da74974398099f4df06233
     and 517eb93612fa6b35cf1845bfd8894d2b35a4772f
---

23d4b048f42531eee488f8ddf510371c9eaa0e0c