From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 01:56:41 +0000 (+0000)
Subject: merge of 60f3b0b53da7fd9ca4c8f4c025a26f9843c016f7
X-Git-Tag: Release-2010-05/1~9453^2~2456^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbb098507e8c959424c32e299d8c91c0ae71332d;p=openembedded.git

merge of 60f3b0b53da7fd9ca4c8f4c025a26f9843c016f7
     and 61a885ef092fb6f5203957b4bbecfd07dcd32f94
---

dbb098507e8c959424c32e299d8c91c0ae71332d