From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Fri, 22 Sep 2006 16:28:10 +0000 (+0000)
Subject: merge of '0b92f5db2f95d0c6de41c8d1e583c2c82e14b488'
X-Git-Tag: Release-2010-05/1~9453^2~735^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1336ff5a4c19cec5b09f375f66b06e4b5b818945;p=openembedded.git

Merge ... '0b92f5db2f95d0c6de41c8d1e583c2c82e14b488'
     and '637a94bb7567a04d1efd6676dc5f5661b57465a3'
---

1336ff5a4c19cec5b09f375f66b06e4b5b818945