From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 8 Apr 2007 11:06:26 +0000 (+0000)
Subject: merge of '1a8e31d2ffcaca539ade0baec8dbd6a927d9c466'
X-Git-Tag: Release-2010-05/1~8868^2~742
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6467c17ee3ed1fc4172b7097866cbfda0d121b54;p=openembedded.git

Merge ... '1a8e31d2ffcaca539ade0baec8dbd6a927d9c466'
     and '7dbda2b624d08e5fc6f9dfea51525e3fe8b4196c'
---

6467c17ee3ed1fc4172b7097866cbfda0d121b54