merge of '5238e30c679ed4c9836291822577cc8cf6d35993'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 21:36:32 +0000 (21:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 21:36:32 +0000 (21:36 +0000)
commitdc08d40ce15f8cc52701ae4ea131d4aff8069522
tree0a6105efcb3c3c8c617cfb01c8c13ebd8b5e9581
parent23e1b626cf2f43fc28cbca114aeddef13697ce02
parent862b6764dadafbdc0f5720150c0120e03626e93c
Merge ... '5238e30c679ed4c9836291822577cc8cf6d35993'
     and '562347f263f94adfc20ea37413a2b6b2a54028fb'