From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 12 Mar 2006 21:06:25 +0000 (+0000)
Subject: merge of cc7e934c29b8aeafc9484a338f156f37cff26530
X-Git-Tag: Release-2010-05/1~9453^2~2233^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea6a78777bc9c0a961cd79730da2561c34089362;p=openembedded.git

merge of cc7e934c29b8aeafc9484a338f156f37cff26530
     and ee702fdf19b9ea88f67db2f6af59c0d51228ec91
---

ea6a78777bc9c0a961cd79730da2561c34089362