From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Sep 2006 08:34:39 +0000 (+0000)
Subject: merge of '3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106'
X-Git-Tag: Release-2010-05/1~9453^2~843
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c13faec8b129332549a6e99c4cb38a4458b42b13;p=openembedded.git

Merge ... '3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106'
     and 'd9037235184b56c405c27cb611e52d27e7879173'
---

c13faec8b129332549a6e99c4cb38a4458b42b13