From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 9 Feb 2007 05:04:36 +0000 (+0000)
Subject: merge of '5503536a71ee0d60ce94d9262c78c993b11f21b0'
X-Git-Tag: Release-2010-05/1~9230^2~89
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=062e431f87e186a28ad1881bbc07b44ab3f034d0;p=openembedded.git

Merge ... '5503536a71ee0d60ce94d9262c78c993b11f21b0'
     and 'cc34d79aab0d07bb518316c63a085fbb79569115'
---

062e431f87e186a28ad1881bbc07b44ab3f034d0