From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 23 Dec 2007 20:52:52 +0000 (+0000)
Subject: merge of '18890ff50a360315f132ff446f7a44ae0dcb4061'
X-Git-Tag: Release-2010-05/1~8113^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28371934e216a1cfd6e8c2d27822993f5cf97774;p=openembedded.git

Merge ... '18890ff50a360315f132ff446f7a44ae0dcb4061'
     and '51181b2162a577bd188446458dc9adf512663dbb'
---

28371934e216a1cfd6e8c2d27822993f5cf97774