From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 14 Mar 2007 01:25:16 +0000 (+0000)
Subject: merge of '506921540e40ca88349b613ff4f509a099c6b2a7'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~17^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ecb9d8fff1f3bacb2ea8c13637beaa9da73ce4;p=openembedded.git

Merge ... '506921540e40ca88349b613ff4f509a099c6b2a7'
     and '6b290ffb4e40297757218b75620f7c02f38890eb'
---

52ecb9d8fff1f3bacb2ea8c13637beaa9da73ce4