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

merge of 05bec92e5e8bff191f23ef22b4602550b92610c6
     and e30ba676fb1f8f84ea8357be0d17862f234f3879
---

8a2b8144cefd14569c2c1bfd8c84cfac593e41c1