From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 11 Apr 2007 13:13:26 +0000 (+0000)
Subject: merge of '426022a70eefa9cef4f266532c2febde719d5cd9'
X-Git-Tag: Release-2010-05/1~8868^2~704^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2f02d09a325bfa9a4aeb6eb0843ecd28326a2e0;p=openembedded.git

Merge ... '426022a70eefa9cef4f266532c2febde719d5cd9'
     and 'f68bdf694384234d06c82a86ab6a067bc03df866'
---

e2f02d09a325bfa9a4aeb6eb0843ecd28326a2e0