From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 15 Apr 2006 03:50:10 +0000 (+0000)
Subject: merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e
X-Git-Tag: Release-2010-05/1~9453^2~2052
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0807ddc5e8f0e65da7b1a88692e788fcfb2516;p=openembedded.git

merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e
     and ccbffbb600e43462f6435f1404be257286d4909d
---

7c0807ddc5e8f0e65da7b1a88692e788fcfb2516