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

merge of 87274db5332eba6f472a3332129b88b8282ccda2
     and 3b6a0bff32c9c79ebeb059cd1559d7731542af03
---

5c70d86825ced73fe07d02a4647e70c54f2efe07