merge of '0f44bcd26a6185d450f29b4b451eaaadda3bcb9b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 21:22:56 +0000 (21:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 21:22:56 +0000 (21:22 +0000)
commitb56420b79858b58d42c24d78a06604ca66e7beb1
tree9763716cb7979b07c4e1e309bbc3fc1d0b782772
parentaddb38f7ab4eb2e58d5253eb955129dbb97f761d
parent5bedfcebd53a07e9732c0c5c243f85775b70d1f3
Merge ... '0f44bcd26a6185d450f29b4b451eaaadda3bcb9b'
     and 'bbd07d21e3c8b5f15d0aceedafa156de21e24e67'