merge of '8e623bd3d9631210d8aa1139b96c2b1091fdd59a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 14:44:53 +0000 (14:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 14:44:53 +0000 (14:44 +0000)
commitc67f3155451ad9d521adda8a3f1b037a7383cbad
tree02f78547530cba980090864108ed558f840b1554
parent0555065cdd667532d77684a79b931f6dc5f25cd6
parent6cba197cde1575018a0c58483c96688b3bac54ec
Merge ... '8e623bd3d9631210d8aa1139b96c2b1091fdd59a'
     and 'bb994d04cb196a4f4c0d840bf8d094da55d09193'