From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 29 Sep 2006 01:53:49 +0000 (+0000)
Subject: merge of '6867f0ae417cb46146424365283886d722fc2431'
X-Git-Tag: Release-2010-05/1~9453^2~669^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32cfcbd4b3a9db64adbe98fa84363f2352bec05e;p=openembedded.git

Merge ... '6867f0ae417cb46146424365283886d722fc2431'
     and '9a846512d8d824d05d745bcdc6285cc8c247b078'
---

32cfcbd4b3a9db64adbe98fa84363f2352bec05e