merge of '2499650fe5abe59981764422b43f078dffad390c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:29:34 +0000 (17:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:29:34 +0000 (17:29 +0000)
commit32e8f349bb510ad6bde5dcb7955535035faf5aa8
tree126b39c2a779a2d27c3f5814d3681480f2965de2
parent97bd7a05a860d862c2b9ecfa0590ccb7abd370ab
parentfaead02b631750b0bffbcb32597fb79e08ab59d7
Merge ... '2499650fe5abe59981764422b43f078dffad390c'
     and '8743eceb5ddbcadab07d007f99e5dfb34706dd69'