merge of '3dba2b4dd503fad1d9b3136a589986975da39964'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:32:51 +0000 (14:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:32:51 +0000 (14:32 +0000)
commit594963c88777af78725128908599f8f7000e5889
treec42d6b727da68414cbbe9cfd6e9e122e2072a953
parent6871dce3e2bb2b48838cab25f699e45832cfe95b
parent78f9dd14be8bda77ba1ae4e35e1f90842fedf8ab
Merge ... '3dba2b4dd503fad1d9b3136a589986975da39964'
     and '876cf34988f6abf7cf9c048909f2a017a4582a61'