From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 22 Sep 2007 22:43:49 +0000 (+0000)
Subject: merge of '21944f0f10c4b5fc5cbb2468a81955b02d5ad97e'
X-Git-Tag: Release-2010-05/1~8616^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ffb356c4f51e3861d2cfad613acd88b04c60ca;p=openembedded.git

Merge ... '21944f0f10c4b5fc5cbb2468a81955b02d5ad97e'
     and '627a0e4a4d8f7eebf74939e0642c5fb01872af01'
---

c1ffb356c4f51e3861d2cfad613acd88b04c60ca