From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 7 Jan 2007 00:44:27 +0000 (+0000)
Subject: merge of 'ad31e71f813b39793fda93f968bef5126ef10111'
X-Git-Tag: Release-2010-05/1~9435^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c665e9631f8d5b2953b01390db44fdca3ce74482;p=openembedded.git

Merge ... 'ad31e71f813b39793fda93f968bef5126ef10111'
     and 'f416512d7123a4132ad3e489f8d789a7ba65fc9b'
---

c665e9631f8d5b2953b01390db44fdca3ce74482