From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 5 Aug 2005 19:40:04 +0000 (+0000)
Subject: merge of 4f3b068b42e8ca31b85ba27c4b0497b10dd7f320
X-Git-Tag: Release-2010-05/1~9453^2~3970
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7456f5321d5953fa8fc2ae36cd61f2a363e60f69;p=openembedded.git

merge of 4f3b068b42e8ca31b85ba27c4b0497b10dd7f320
     and db631e19abd4d2b1049a24b5d7ea623dc8673a99
---

7456f5321d5953fa8fc2ae36cd61f2a363e60f69