From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 17 Mar 2007 21:40:31 +0000 (+0000)
Subject: merge of '079169fa4d08258d986a995133f464bd3d6b1447'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c70a664b00ed081f8983fa3e08fb13648b68601;p=openembedded.git

Merge ... '079169fa4d08258d986a995133f464bd3d6b1447'
     and '9ac358a36d17b24c57af9ffaaeed3e835fd8768a'
---

9c70a664b00ed081f8983fa3e08fb13648b68601