merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 14:48:57 +0000 (14:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 14:48:57 +0000 (14:48 +0000)
commitc241a0745bcc75e61bc2522ef089483fb6037cc7
tree1deff7abf6e3302a9a8c7a168c280079d4e987d8
parentf7176db9a62177003ad6352e357f30824a90a3da
parentb76ebfe8428225c6f58304b98bd15c0af684b727
Merge ... 'a41270f197c19482f466d5e12850e9c76c7358b5'
     and 'f3edd5c73b71cef16fcff1594f21d2d1af16cf3a'