merge of '54d43c826adc6b1f25620196f4a9115039e1900c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:48:39 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:48:39 +0000 (16:48 +0000)
commitc8936dcbee82a3ae1002cc9264563239675721d7
tree649823ef85132e45e4abb7e4f347d42fae3b9e62
parentaeeba8453e8e5bd44cbe2d96a1c108bb5a883c3e
parent5d4f7f88e103dbf389db32e37dac86b3997c51fe
Merge ... '54d43c826adc6b1f25620196f4a9115039e1900c'
     and '5f9d9345cb8ec606bf01fa3933d8377bf04c749f'