From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 19 Dec 2006 16:31:59 +0000 (+0000)
Subject: merge of '31db29464dd50bf11190fd9efbeaece3d3e83025'
X-Git-Tag: Release-2010-05/1~9453^2~125^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4f2e81674c1de8e29d4c03de851a2d133536688;p=openembedded.git

Merge ... '31db29464dd50bf11190fd9efbeaece3d3e83025'
     and 'c4e8134bca9407021f67cdf9cd64c63ed7bd009f'
---

a4f2e81674c1de8e29d4c03de851a2d133536688