From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 19 Jun 2006 03:19:15 +0000 (+0000)
Subject: merge of 013572ec4e1d77ecdc8721416e81afacf5d19b05
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22bcbc86a71317ff4ee4c580105460737f0957b3;p=openembedded.git

merge of 013572ec4e1d77ecdc8721416e81afacf5d19b05
     and 7309517bd7e28306f85628aae0a013347f742df7
---

22bcbc86a71317ff4ee4c580105460737f0957b3