From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 4 Sep 2007 16:23:16 +0000 (+0000)
Subject: merge of '4f12086dd4becc0837a2479c289abb8ce97cc931'
X-Git-Tag: Release-2010-05/1~8718^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef7a8d308f6ba87e4b80ad866d7a2ae0cfb82626;p=openembedded.git

Merge ... '4f12086dd4becc0837a2479c289abb8ce97cc931'
     and '8c69b6f5a69bd9c930b72d9ba3949a8f629a5721'
---

ef7a8d308f6ba87e4b80ad866d7a2ae0cfb82626