merge of 'c3ca473fa0f2691fd3779230e61273dde401f5a4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:23 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:23 +0000 (17:20 +0000)
commited2948f984ef1ea472362cd08fb08dc91f006da6
treefba140dcc3e9721776fe9e9936fde2f94f43b5e1
parent7e904c0ca438999e88e4cd63214b64d11874c1c5
parent7989e677fd15c718c3b6e25fd7fcaf883b7bb1fc
Merge ... 'c3ca473fa0f2691fd3779230e61273dde401f5a4'
     and 'eae950ac7860db142942252d261d665e31150f2d'