merge of '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 15:37:15 +0000 (15:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Nov 2007 15:37:15 +0000 (15:37 +0000)
commit7031df88c171569adb7c6827df18cc86ba1f5b44
tree6746b502baf24c4988133d51821c04a61f762610
parentfcacf6ef057669597c283ed4d181dc12991334d4
parent567d05ff4a17d6b8015fc4888c94f38d296def30
Merge ... '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
     and '0b7b234637a0d41420b6a596ef10e38857ff6f57'