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)
commit71a25a5bb805434913fb8df9681e387aaa6bab69
treea2da25478eafc560888a31b398584392871ce685
parenta26724d94e4499a95343d7d4069dc3c006f85365
parentdb609dad15bffd0c11445fbb4c5d5413f7c01620
Merge ... '452752a8a35efe6e789ae2bdef83478bdb218f00'
     and '9c56bb4603d094151503b996376d78874b9d938c'