From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 10 Aug 2006 13:42:58 +0000 (+0000)
Subject: merge of 'e159af24ff18ed3b55b092ed9b90e7e60221c899'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbd481e248401ed1f29272f560d1e2a1267d4d51;p=openembedded.git

Merge ... 'e159af24ff18ed3b55b092ed9b90e7e60221c899'
     and 'ebfa533fbc0b4ebe4011d0117987194f59487d33'
---

cbd481e248401ed1f29272f560d1e2a1267d4d51