merge of '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 11:16:50 +0000 (11:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 11:16:50 +0000 (11:16 +0000)
commitdb2c72991c243b6a510cbd751ae6294a8130a4c4
tree86b1d95494c9e9972c520c0c77ecb2e14602b2a3
parentfe20d17f5d68f0c439852a662efe33f1078f7cdb
parentadcc4854f728186b90f4d09184a3d9ec5e321b37
Merge ... '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
     and '40ef55d01967050e97ee3727a1e5e15b968e0a92'