From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 16:18:05 +0000 (+0000)
Subject: merge of 31db29464dd50bf11190fd9efbeaece3d3e83025
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba41e5ed9be0a549bdaedf7cf06d7ee0651b034;p=openembedded.git

merge of 31db29464dd50bf11190fd9efbeaece3d3e83025
     and 5ebb0ee9c40d31adda8f48f710acc534554e2f88
---

eba41e5ed9be0a549bdaedf7cf06d7ee0651b034