merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:49:03 +0000 (19:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:49:03 +0000 (19:49 +0000)
commit1b42f355f5e621f126b9db86cef8419509ed1e13
tree929ed8c4b9a27162600d7bc877584d2d53078aaf
parent6d811306b54b4437df0b60983ab96970ae662ff3
parenta02935a50101aba5621d8ca06d83da5aa1261b46
Merge ... 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
     and 'e3bce18db3557d05994587f4a53578acbc1f3792'