From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Thu, 29 Nov 2007 19:09:40 +0000 (+0000)
Subject: merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
X-Git-Tag: Release-2010-05/1~8253
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82935fa891f97961cd0607261e42fcb3e83be41c;p=openembedded.git

Merge ... '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'
---

82935fa891f97961cd0607261e42fcb3e83be41c