From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 3 Aug 2005 21:07:05 +0000 (+0000)
Subject: explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faa3ea865bbec5433bcc950fae04d7554de7ba33;p=openembedded.git

explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a
              and 7dcc40f11838a5d4253110fb45d10c0cd109a0ff
   using ancestor 6c249e86f20cab16da75a620e43f22520d6b1f7b
        to branch 'org.openembedded.nslu2-linux'
---

faa3ea865bbec5433bcc950fae04d7554de7ba33