From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 1 Mar 2007 10:01:33 +0000 (+0000)
Subject: merge of 'a9e6f94b65227e58f5c546973c24a3202e0059a6'
X-Git-Tag: Release-2010-05/1~9133^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98462e4e7cedd548817f0686b62defbddb94f5a;p=openembedded.git

Merge ... 'a9e6f94b65227e58f5c546973c24a3202e0059a6'
     and 'c405009477f47b2362e45a8a3283471611ce9f3e'
---

f98462e4e7cedd548817f0686b62defbddb94f5a