merge of '964b970138436b573add519a1eae7ca7aec32517'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Jan 2008 15:39:09 +0000 (15:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Jan 2008 15:39:09 +0000 (15:39 +0000)
commit9d1b8ff9cc28b6c4e0208b2cd0dc946b59b2b50f
tree92e90885c812dc5abcd04471f691db851f296047
parente07765d6ea242d863c3f4f81bdc6379ae61347c5
parentb7031362eafd33ad5c421b07f2bc4f37e4f8a829
Merge ... '964b970138436b573add519a1eae7ca7aec32517'
     and 'b8eab3d0461de7af79a745d6b20c8e008acb7af4'