From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 21 Jan 2008 02:01:21 +0000 (+0000)
Subject: merge of '68a230b60662c9a02fcec5ffaa9a90510e7b14f4'
X-Git-Tag: Release-2010-05/1~7855
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae30d8e1a6dde681b1293464007a9fd8bac0b871;p=openembedded.git

Merge ... '68a230b60662c9a02fcec5ffaa9a90510e7b14f4'
     and '6a123114c50d24ba777fd796259528ed55d645bd'
---

ae30d8e1a6dde681b1293464007a9fd8bac0b871