From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 5 Dec 2005 18:24:28 +0000 (+0000)
Subject: merge of 39a77001ea8e83e4668aac829096b729bcc93056
X-Git-Tag: Release-2010-05/1~9453^2~2980
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669b4130054a6aac682e13f9f90ec90196642c37;p=openembedded.git

merge of 39a77001ea8e83e4668aac829096b729bcc93056
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d
---

669b4130054a6aac682e13f9f90ec90196642c37