From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 6 Mar 2008 13:24:13 +0000 (+0000)
Subject: merge of '266509b97479fd932511cb63332861a369849008'
X-Git-Tag: Release-2010-05/1~7554
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=151938cb326f8b63dbd32d9663f35b36e3b482ae;p=openembedded.git

Merge ... '266509b97479fd932511cb63332861a369849008'
     and '794e1f022e3fc8866fcadb5c7158d8521fc62a1c'
---

151938cb326f8b63dbd32d9663f35b36e3b482ae