From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 22:23:12 +0000 (+0000)
Subject: merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
X-Git-Tag: Release-2010-05/1~9453^2~2436
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4156198b0d0399792402508b2d0854f106765b0;p=openembedded.git

merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
     and eedeac9741d0ad1da70a5545c21f0803a63bf9f0
---

f4156198b0d0399792402508b2d0854f106765b0