From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 29 Nov 2006 11:57:28 +0000 (+0000)
Subject: merge of '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
X-Git-Tag: Release-2010-05/1~9453^2~232^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d0259ee22ec926260473a4d6ff82f8420cb946b;p=openembedded.git

Merge ... '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
     and 'a052255457a42850dee32c7e42a8d43e98edf445'
---

7d0259ee22ec926260473a4d6ff82f8420cb946b