merge of '114caf859f66364143cd179bd3ae50672f123d24'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 09:57:22 +0000 (09:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 09:57:22 +0000 (09:57 +0000)
commitb4e6341f3f632c9c60531de9cf77633d0cc5ee4c
tree1cfdff24eb3ec93411af318e4afc9319268fe465
parentad6297e2bdb9bf190b8d89f755ea265b21d589cb
parent68468c0d2a3b5c7f5cd67d37116758b5cb1d6dd1
Merge ... '114caf859f66364143cd179bd3ae50672f123d24'
     and '317ff5b9d6db289545e8b5bae03ac89c5d36024f'