From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 17 Nov 2006 04:43:45 +0000 (+0000)
Subject: merge of '08136d5064fb99224b41d7d2c341f887c04a9f13'
X-Git-Tag: Release-2010-05/1~9453^2~434^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e43f0d2302578ce08753c26325b188b9d9d6278;p=openembedded.git

Merge ... '08136d5064fb99224b41d7d2c341f887c04a9f13'
     and 'a3369ab4720700b0631cc1b56b85ae78f98ef76f'
---

7e43f0d2302578ce08753c26325b188b9d9d6278