merge of '01874aea004ac1a1ba9f8bc4a31eb07bd7865027'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Sep 2008 13:59:06 +0000 (13:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Sep 2008 13:59:06 +0000 (13:59 +0000)
commitd559210f6eabb99e30296e74e24fa8412c9f1aa8
tree1e18735eee52919b5c028990a35ba08f650a1a67
parent078d5ad1ead15d27d9d4b727638d35fd6f82fbdb
parentfe619371ad73f1cbcde4705436f1daf24e800bef
Merge ... '01874aea004ac1a1ba9f8bc4a31eb07bd7865027'
     and 'ac34d32574e42042c7afc4d0500547c97cf87132'