From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 14 Aug 2005 20:05:07 +0000 (+0000)
Subject: merge of 0a13f5649c4ff4f86d90c76b024acd06c136a588
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~7^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1949691f684ae7c0d19a74e19fb37342fa553361;p=openembedded.git

merge of 0a13f5649c4ff4f86d90c76b024acd06c136a588
     and 5da8bfb1d71128589003d0bb6fe70a7a5faeaa0e
---

1949691f684ae7c0d19a74e19fb37342fa553361