From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 6 Jan 2008 19:58:19 +0000 (+0000)
Subject: merge of '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
X-Git-Tag: Release-2010-05/1~8004
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e152b2196bee93cbefe5a576d8649cc7388aa435;p=openembedded.git

Merge ... '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
     and '85d4ab967941a2bea382fb9211cd65212be527a6'
---

e152b2196bee93cbefe5a576d8649cc7388aa435