merge of '452752a8a35efe6e789ae2bdef83478bdb218f00'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:55 +0000 (00:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:55 +0000 (00:40 +0000)
     and '9c56bb4603d094151503b996376d78874b9d938c'


Trivial merge