From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 6 Jan 2007 09:35:59 +0000 (+0000)
Subject: merge of '5f91da5c49d84ece0c2aa5ee0abc2db5fed0de5c'
X-Git-Tag: Release-2010-05/1~9453^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01cf80fb32fbe3c192a3fa8115e38cb5c20589fa;p=openembedded.git

Merge ... '5f91da5c49d84ece0c2aa5ee0abc2db5fed0de5c'
     and 'e316470a647d6066a45ad86ba177092678b4d89b'
---

01cf80fb32fbe3c192a3fa8115e38cb5c20589fa