From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 12 Sep 2005 09:37:18 +0000 (+0000)
Subject: merge of 80332541fe8af97cf6e4ae0388ba2b0f38b88605
X-Git-Tag: Release-2010-05/1~9453^2~3551
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=380837491d26cdbdd3fe0bb646ec72126575651e;p=openembedded.git

merge of 80332541fe8af97cf6e4ae0388ba2b0f38b88605
     and 8886e2ff4b093b9718b9f8291827812566ffd11c
---

380837491d26cdbdd3fe0bb646ec72126575651e