From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 16 Jan 2006 19:15:09 +0000 (+0000)
Subject: merge of 9e933b0af0fc064b5d0c5706a3ed1459685dc82e
X-Git-Tag: Release-2010-05/1~9453^2~2638
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df6d761b3ad923685bd61a9f04a111744a1d6ca2;p=openembedded.git

merge of 9e933b0af0fc064b5d0c5706a3ed1459685dc82e
     and b34de7d4aba1b19d8802068ebd9f1d15bc5d4da5
---

df6d761b3ad923685bd61a9f04a111744a1d6ca2