From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 30 Sep 2006 10:18:30 +0000 (+0000)
Subject: merge of '2283d6d9e723829fa3f8206557ade078993a8e80'
X-Git-Tag: Release-2010-05/1~9453^2~666
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89bb9f95ca11e21b28bc3191e37c4736173cf83;p=openembedded.git

Merge ... '2283d6d9e723829fa3f8206557ade078993a8e80'
     and 'b98ae84398e0cce519822aa156ec0ef1d5de9794'
---

e89bb9f95ca11e21b28bc3191e37c4736173cf83