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

Merge ... '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
     and '6fde327bd56320660fd115cc20e7a12e7379867d'
---

87a16c99c6b15d99852684f5595e64ae0aee7531