From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Sep 2006 17:10:06 +0000 (+0000)
Subject: merge of 3313872abc2bfcbfb21ee59fce1b8d5dcc921f9e
X-Git-Tag: Release-2010-05/1~9453^2~735
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2980ebc7d5b714ebb7e2a335e3f665b57620fcb7;p=openembedded.git

merge of 3313872abc2bfcbfb21ee59fce1b8d5dcc921f9e
     and bc4c059f4f2e150e3e6a17f3e80ee88cbd36e52e
---

2980ebc7d5b714ebb7e2a335e3f665b57620fcb7