From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 15 Nov 2005 06:36:15 +0000 (+0000)
Subject: merge of 1d77723ab3664440912bed42625259c5a156e94e
X-Git-Tag: Release-2010-05/1~9453^2~3083
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0122cc8da2c072243180ffb7cb051f56a53349f;p=openembedded.git

merge of 1d77723ab3664440912bed42625259c5a156e94e
     and 63e5b79a648b18956dc5b36670316f37ea851914
---

e0122cc8da2c072243180ffb7cb051f56a53349f