From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 14 Jan 2006 08:45:40 +0000 (+0000)
Subject: merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
X-Git-Tag: Release-2010-05/1~9453^2~2654^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f93bc82fd506c282aa963e0b4ed5de8412b9695;p=openembedded.git

merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
     and e7693771f829a9afffa119fcdc723d562cbb94fa
---

0f93bc82fd506c282aa963e0b4ed5de8412b9695