merge of '20e69e89a02bb1c12fc542cba8d841fc06509088'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Mar 2007 11:28:28 +0000 (11:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Mar 2007 11:28:28 +0000 (11:28 +0000)
commiteb47b38d47113a5e9aa61a80cc02ade8d3269b63
tree1af7ed7d6ea1468ebe4be473564685fca950d90e
parent74c158e473e5e78ad24861bb8fbde6fccccc4a84
parent7db8984b275181a30ec7fcc47e2b78dbfe1ca698
Merge ... '20e69e89a02bb1c12fc542cba8d841fc06509088'
     and 'f452cb1c5095e423f7603c4bce5c63518541aeb0'