From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 3 Mar 2007 18:49:31 +0000 (+0000)
Subject: merge of '93697b2e52ed50509b62f950722d2032051cbe72'
X-Git-Tag: Release-2010-05/1~9103^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f5373364f6026bdc1ddf20d973c4dadd8a80509;p=openembedded.git

Merge ... '93697b2e52ed50509b62f950722d2032051cbe72'
     and '9f92f0834987ae2539df85d39df958a57e026236'
---

4f5373364f6026bdc1ddf20d973c4dadd8a80509