merge of '129fcb069108afba06df7a75bcabd8a4ca81c06b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:58:18 +0000 (00:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:58:18 +0000 (00:58 +0000)
commit71389e50b0bc2278939a233a935d6458ccee2a0a
tree7d531aaa7addcf7c21c9ec6278e97ac17e5a33d5
parent8236f3ddafc939b3e2295879b4289fd954258eef
parent4a0a8f2bbfcec5145178091c5703be7f5dfc034c
Merge ... '129fcb069108afba06df7a75bcabd8a4ca81c06b'
     and '7e91a33e25e4db6e39c13e5d76825e86b64370e0'