merge of '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 09:53:22 +0000 (09:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 09:53:22 +0000 (09:53 +0000)
commitdb959910da84c8ab12cbc59c0484d41a0b589549
tree21c4e031d963730f3660285266e25d4d90af243c
parentedbe836e847558e823eb6954b1976d866aee9085
parentec5a5fcd488d5f7b2751647120b4d2fec507eda9
Merge ... '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'
     and '9a0857ebdef17f18989f0702e43595ce522a7a24'