merge of '5156b0a1647a5b55a939de58b3824e987070afee'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 18:42:27 +0000 (18:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 18:42:27 +0000 (18:42 +0000)
commitddfc99c3ffea5f9b9b0478300d9204ed3abf8e2a
tree2ef6ef18d8d558ca52099ca6eacd31f39248652c
parent717a89afddff296d0320c8044ebb0d435155d95f
parentb2074fa8c95c3afcf62327d0cdeccf0528433f93
Merge ... '5156b0a1647a5b55a939de58b3824e987070afee'
     and '7679548c35575ac65d8c4678ed5c0551529a56b6'