merge of 'c1fd09a0b09739640d55402e3a267d14a39bfd80'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:32 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:32 +0000 (17:20 +0000)
commit1e5a836412dbc372c81d37ac4c288857619ed1f6
treed33f1d8eed4d591823d2ba86772a116fead3f60f
parent9aae17c427fc2842170f760b0a803665ccd205ea
parented2948f984ef1ea472362cd08fb08dc91f006da6
Merge ... 'c1fd09a0b09739640d55402e3a267d14a39bfd80'
     and 'f32bd285f81d67ffe77c826a1f15be44ccefdc3b'