From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 17 Jan 2007 15:55:38 +0000 (+0000)
Subject: merge of '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
X-Git-Tag: Release-2010-05/1~9361^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070f71e1d468e29882c8c2f42ed5f50c7fefa7ad;p=openembedded.git

Merge ... '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
     and 'e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c'
---

070f71e1d468e29882c8c2f42ed5f50c7fefa7ad