From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 1 Sep 2005 19:41:34 +0000 (+0000)
Subject: merge of 29134267458b518b87fa720d106c0188db1b6131
X-Git-Tag: Release-2010-05/1~9453^2~3649^2~13^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0fb1623f194f09d6c783bb112d7b27ee8f2c964;p=openembedded.git

merge of 29134267458b518b87fa720d106c0188db1b6131
     and 55e352bed0a52f8ee40f1ab81b902297e574eb7c
---

c0fb1623f194f09d6c783bb112d7b27ee8f2c964