From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 29 Oct 2006 13:26:37 +0000 (+0000)
Subject: merge of '48a764df77d365129ff1353e6c89bd2787a10485'
X-Git-Tag: Release-2010-05/1~9453^2~554
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eefe1a09db7dab17fe4db1adc6f2cc27bf8175f;p=openembedded.git

Merge ... '48a764df77d365129ff1353e6c89bd2787a10485'
     and 'ee13a485ec097c5eb2f6e8a232ad7edc49b5ad75'
---

7eefe1a09db7dab17fe4db1adc6f2cc27bf8175f