merge of '9ac27641c9c3a76dca545c31690c7f5780076ff7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 12:17:01 +0000 (12:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 12:17:01 +0000 (12:17 +0000)
commitedbc711c3614501aa4a1953eb1d2d6eb299088fc
tree599f9bea2eeb06388aeadfde5524e7deafd36b99
parent976f1b929a838739f5c24f2618358b41c53a1932
parentdb8fb05c672025788cac42c01fd30145de0119cc
Merge ... '9ac27641c9c3a76dca545c31690c7f5780076ff7'
     and 'e6282b8a6c27894ff62776a8cd275d5f0a9a0efd'