From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 21 Jan 2006 00:22:57 +0000 (+0000)
Subject: merge of 8ae00e8423679ec41790b01db397b47b07473927
X-Git-Tag: Release-2010-05/1~9453^2~2608
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc4e7483657130b7c4fbc596bcfe0572d60b877;p=openembedded.git

merge of 8ae00e8423679ec41790b01db397b47b07473927
     and 90cfec2b058d549c4919f09e6d58e09c7dabca84
---

3fc4e7483657130b7c4fbc596bcfe0572d60b877