From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Sun, 6 Jan 2008 01:29:28 +0000 (+0000)
Subject: merge of '15ad25c2df41e72ad281610da11230b4d0c9bd20'
X-Git-Tag: Release-2010-05/1~8013
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcffeebb0e4b33f0a20fa73699fdd21c98391ce;p=openembedded.git

Merge ... '15ad25c2df41e72ad281610da11230b4d0c9bd20'
     and '5bfb1624d0726e9c07b5b20f7ecccb236fee357c'
---

bbcffeebb0e4b33f0a20fa73699fdd21c98391ce