From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Mon, 22 Sep 2008 14:48:25 +0000 (+0000)
Subject: merge of '1e74f5ed8af305cb8e17fcf9acd8941acaec53d5'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3b0aa0ba55f754208c1a51ba706c34f6eb6f23c;p=openembedded.git

Merge ... '1e74f5ed8af305cb8e17fcf9acd8941acaec53d5'
     and '52946428eea7cbbb3e9f7d6d96641b3ed74ae8df'
---

b3b0aa0ba55f754208c1a51ba706c34f6eb6f23c