From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 18:36:12 +0000 (+0000)
Subject: merge of 06709bc13077018369389fc415f45693986fa694
X-Git-Tag: Release-2010-05/1~9453^2~2424^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edab0569b271a6c11d611afcdeb3f8a5a3a682e6;p=openembedded.git

merge of 06709bc13077018369389fc415f45693986fa694
     and 1fe8f28c2e6a22a4a5579472503b814874f1eebf
---

edab0569b271a6c11d611afcdeb3f8a5a3a682e6