merge of '24e6547fb1a547a4930278a58e0636a8d40f93b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:47:44 +0000 (10:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:47:44 +0000 (10:47 +0000)
commitbfc6303d76995cd0a50d044f8f7a642a12a67cad
tree080d9a1c5a891703544d1d4c2d013cf48bc5e998
parent8fcb3a0052943dc2ecf1d5d1f3552ae0d1d8bf6d
parentf98462e4e7cedd548817f0686b62defbddb94f5a
Merge ... '24e6547fb1a547a4930278a58e0636a8d40f93b6'
     and 'c3e65881a9b8df367e00858413c2fb4af7439f7c'