From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sat, 1 Sep 2007 20:03:41 +0000 (+0000)
Subject: merge of '155c9f469df51f8d2bb0f7240c5ce5642ae38c49'
X-Git-Tag: Release-2010-05/1~8749^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d0faa85ce111bc32bfa0e8685227db046ad85df;p=openembedded.git

Merge ... '155c9f469df51f8d2bb0f7240c5ce5642ae38c49'
     and 'bcabf2efa73e1bd5645cab24e37b6fefb484deb7'
---

0d0faa85ce111bc32bfa0e8685227db046ad85df