From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 15 Dec 2007 16:00:43 +0000 (+0000)
Subject: merge of '6a6524b2edba4ee2d273bc4114c24767b9e78a8e'
X-Git-Tag: Release-2010-05/1~8136^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d49459630828716adb5130ebba02cc95fbae8e44;p=openembedded.git

Merge ... '6a6524b2edba4ee2d273bc4114c24767b9e78a8e'
     and 'a936edc2be00c83e35e647a91a0923ea2e0ee3ce'
---

d49459630828716adb5130ebba02cc95fbae8e44