From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 7 Mar 2007 12:52:10 +0000 (+0000)
Subject: merge of '1ed4ea88aa1659704dd7e9205023eaef7387f051'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bcf59f2d8c22c9a41f5e93fad225af6e46c5d4d;p=openembedded.git

Merge ... '1ed4ea88aa1659704dd7e9205023eaef7387f051'
     and '90400ad96343bd116689ed5d43b10e8bbf0b3577'
---

1bcf59f2d8c22c9a41f5e93fad225af6e46c5d4d