From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 1 Sep 2006 13:06:11 +0000 (+0000)
Subject: merge of '8bfdfaf4e5f3e1114fa91502c9eafe85c21a06dd'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~109
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7023ef3512a8b7e0a08b4401e10085eb954b55d;p=openembedded.git

Merge ... '8bfdfaf4e5f3e1114fa91502c9eafe85c21a06dd'
     and 'ce48c156b1ce78cf4d83f981c103ec2f8d2b529e'
---

d7023ef3512a8b7e0a08b4401e10085eb954b55d