From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 4 Jul 2007 23:56:59 +0000 (+0000)
Subject: merge of '7247d50baa3969c4328d37f4c560e6b56963636c'
X-Git-Tag: Release-2010-05/1~8868^2~216^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d0e263039165834e23471bdf0f860c46d68c31;p=openembedded.git

Merge ... '7247d50baa3969c4328d37f4c560e6b56963636c'
     and 'c1258545caf65ca7330dc5d776336c46135d7d52'
---

70d0e263039165834e23471bdf0f860c46d68c31