From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 31 Jul 2005 18:38:54 +0000 (+0000)
Subject: merge of b6008583593bfaa7470e73a2fd374f3a43d499d7
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~36
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea61e7abd1351afe1c165411b79694143437c8c;p=openembedded.git

merge of b6008583593bfaa7470e73a2fd374f3a43d499d7
     and c3ddcc365753e2e7ccc7021dbf8d917809ec978d
---

9ea61e7abd1351afe1c165411b79694143437c8c