From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 16 Jul 2005 10:38:03 +0000 (+0000)
Subject: merge of 0b04419bb0c1057c44d662dcafecc131e7ad93f5
X-Git-Tag: Release-2010-05/1~9453^2~4151
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93120a45883d73a32d67f004af3cf52d38f983e3;p=openembedded.git

merge of 0b04419bb0c1057c44d662dcafecc131e7ad93f5
     and 9a6d9077bf6279d2655773b30d7bf89f049d1ce6
---

93120a45883d73a32d67f004af3cf52d38f983e3