From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 4 Mar 2007 20:42:16 +0000 (+0000)
Subject: merge of 'a46fe2d26d8c7aac5482b90f8e004435a87e488b'
X-Git-Tag: Release-2010-05/1~9088^2^2^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e51ddf6a209b2215160db1788e9a3ef381d5fd;p=openembedded.git

Merge ... 'a46fe2d26d8c7aac5482b90f8e004435a87e488b'
     and 'd48faafc2d6c701f69b6f3eb81394114da352744'
---

51e51ddf6a209b2215160db1788e9a3ef381d5fd