From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Wed, 27 Sep 2006 22:32:26 +0000 (+0000)
Subject: merge of '0b0e5efd590cdcc1847caa5505a008258f7a2e45'
X-Git-Tag: Release-2010-05/1~9453^2~677
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3ec54144d309509ed217f7b1fe37efa384c51b;p=openembedded.git

Merge ... '0b0e5efd590cdcc1847caa5505a008258f7a2e45'
     and 'b95778d4aa9b6135b43b0d0a7b8b4f0d28d0be95'
---

9c3ec54144d309509ed217f7b1fe37efa384c51b