merge of '61f51adb910c35364a495ee3a926fea53aad7b57'
authorKoen Kooi <koen@openembedded.org>
Thu, 16 Nov 2006 23:31:39 +0000 (23:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 16 Nov 2006 23:31:39 +0000 (23:31 +0000)
commit21f108d8a57a33a9e3742aecfac549994f868845
tree6f492047ac5aee4364b5023900b61d3ebea29ae6
parenteabe2d63dc4635ca43903557db35e5bd065d55e6
parent6b49a31e04413e71eeef26e7b494fec8b13f35f5
Merge ... '61f51adb910c35364a495ee3a926fea53aad7b57'
     and 'd843059235f472ce11d08dbb0b2d70c8f9de243b'