From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 29 Jun 2006 19:47:18 +0000 (+0000)
Subject: merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
X-Git-Tag: Release-2010-05/1~9453^2~1366^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e26f686b6c18fe1f57bb20d5edfa81699377ee1;p=openembedded.git

merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
     and 7847e7c8b41faf980a8a08156c7c8a5bc616f814
---

4e26f686b6c18fe1f57bb20d5edfa81699377ee1