merge of '147ea1808ce9dcca465549615b959e4aedc81359'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 12:51:37 +0000 (12:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 12:51:37 +0000 (12:51 +0000)
commite97d4de56f1118f4b6f8914b76033b5cb7ed0913
tree40ef6e482c344a9f5121b76ffdfe3697b80006c0
parent959d5584822d0a283495041ff495e6f51592f4c0
parent966ed6c2c1b5bf939d484a00ea3e70d0032cbd9f
Merge ... '147ea1808ce9dcca465549615b959e4aedc81359'
     and '75803ac499b6e7802ec35d07693154274da0770c'