From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 7 Jan 2006 17:33:34 +0000 (+0000)
Subject: merge of 0241a34ef686562063ef44062a77a85c9c8343ca
X-Git-Tag: Release-2010-05/1~9453^2~2715
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=511684d214520a8bd7f9b95ca0ffce860009d6f2;p=openembedded.git

merge of 0241a34ef686562063ef44062a77a85c9c8343ca
     and 37e4e397cfd639a4c09ed7c5f8d5a23a81a966c7
---

511684d214520a8bd7f9b95ca0ffce860009d6f2