From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 15 Jan 2007 16:56:14 +0000 (+0000)
Subject: merge of 'cd5daaff9a39b5a7cfdc8b51c1371e6f01530b64'
X-Git-Tag: Release-2010-05/1~9366^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=906baa70751285bc921c40e3ebe5964fbeac7bbf;p=openembedded.git

Merge ... 'cd5daaff9a39b5a7cfdc8b51c1371e6f01530b64'
     and 'de437286d494ecd4e5d51aaa8d8a07c9bbe318b5'
---

906baa70751285bc921c40e3ebe5964fbeac7bbf