From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Sun, 8 Jun 2008 21:35:20 +0000 (+0000)
Subject: merge of '12044547859d68999d0a4712daf7bea26128696c'
X-Git-Tag: Release-2010-05/1~6723^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3045a57f99f70307e155ed460525f9b38d9b8be3;p=openembedded.git

Merge ... '12044547859d68999d0a4712daf7bea26128696c'
     and '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
---

3045a57f99f70307e155ed460525f9b38d9b8be3