From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 27 Jan 2007 21:39:31 +0000 (+0000)
Subject: merge of '0e9339789b8be553a43cbdf4010cc70792764d17'
X-Git-Tag: Release-2010-05/1~9332^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7186a6cbd89018cc88b89aed599678ff5b703bee;p=openembedded.git

Merge ... '0e9339789b8be553a43cbdf4010cc70792764d17'
     and 'd4eb4ca83d3c296c262477a5a3f77d388d7a8ceb'
---

7186a6cbd89018cc88b89aed599678ff5b703bee