From: Matt Reimer <mattjreimer@gmail.com>
Date: Mon, 27 Nov 2006 21:35:56 +0000 (+0000)
Subject: merge of '2b33aa7e14fb73dac68d3c76e023f7c50ddf272b'
X-Git-Tag: Release-2010-05/1~9453^2~259
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=313c82e3bd14e15219a0ce799e3862d64405f25b;p=openembedded.git

Merge ... '2b33aa7e14fb73dac68d3c76e023f7c50ddf272b'
     and '8fd787cd0451416efde2b7d17050c5337130fe3c'
---

313c82e3bd14e15219a0ce799e3862d64405f25b