merge of '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:10:58 +0000 (13:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:10:58 +0000 (13:10 +0000)
commit136fd5b056088e2f71e2baf9b17a623575e856e8
tree539f2e55d5ee7d4fceb4aaac19021cfb09f2913e
parent422076569aeb070ddd92af6650231aeadf75b159
parentd1406ee2bd3dcb5136d2d96daefd1e93505eaac6
Merge ... '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
     and 'c3806da7db88d5cd14b6cc7ed62c575f1269f6d4'