From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 10 Jul 2005 05:44:03 +0000 (+0000)
Subject: merge of 1031d19d0f1be5bb1839e46b6f7dd3cc1bc86668
X-Git-Tag: Release-2010-05/1~9453^2~4183^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8488fd8493e249c8dc7d02d4fcb10cdbf16aba6d;p=openembedded.git

merge of 1031d19d0f1be5bb1839e46b6f7dd3cc1bc86668
     and 90985ad6d341c9f6bdacb4243ddf551bffb6c2d6
---

8488fd8493e249c8dc7d02d4fcb10cdbf16aba6d