From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 4 Oct 2006 13:47:03 +0000 (+0000)
Subject: merge of '4406e0f8d2846e24e63874a31dd5fddea1dcdbad'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48eda25589839285b951e58728297ee83a3a2c4c;p=openembedded.git

Merge ... '4406e0f8d2846e24e63874a31dd5fddea1dcdbad'
     and '60e987f715a76c533a624e9f7fab56ff0374dd5d'
---

48eda25589839285b951e58728297ee83a3a2c4c