merge of '6fba3dd9aacc87c46cb6ad12712c76d7f07ec4ee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 18:17:56 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 18:17:56 +0000 (18:17 +0000)
commit82c6589e33bf7035a4e71f70ab409c412c220db7
tree0829afa963409450e5d3bc06a170658adf713efa
parent4afef870a4cacf726ff356a1816bf65809b74a9a
parent5d4c23181e14138b361483a29d35fc7c3709c97e
Merge ... '6fba3dd9aacc87c46cb6ad12712c76d7f07ec4ee'
     and 'c7087b824ad0e4d13f3e6b73315febe510397afb'