From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Sep 2006 09:49:31 +0000 (+0000)
Subject: merge of 'a70eb00abecc56b2732841f765ef8ad1a5bfd8d8'
X-Git-Tag: Release-2010-05/1~9453^2~835^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e1b0124cedc16a8951dbb2a44395b2cc81776a9;p=openembedded.git

Merge ... 'a70eb00abecc56b2732841f765ef8ad1a5bfd8d8'
     and 'f381f85181c143ee817eed25326a5e226729146d'
---

0e1b0124cedc16a8951dbb2a44395b2cc81776a9