[oe-commits] : merge of '028626165f94e6e0adee3c762f85ef505eeaa914'

[OE GIT Trial]

Module: OE.dev
Branch: master
Commit: 42a8cf46720a308b13d750eb1f538dfd8ca160bc
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=42a8cf46720a308b13d750eb1f538dfd8ca160bc

Author:  <xjqian at openembedded.org>
Date:   Fri Sep 19 02:34:43 2008 +0000

merge of '028626165f94e6e0adee3c762f85ef505eeaa914'
     and '57913c45a2b8c01ec5a3c8f98a39b2fa258c0ffd'

---