merge of 'a5ceef80167451640ed57234e28008169c49ef38'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:13:56 +0000 (19:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:13:56 +0000 (19:13 +0000)
commitf60de8368154bdc3549b11911d09f3e6ccd81042
tree57c5b9d3da567dacf93872ca75d6832a7dcbf303
parentbab0bc1011c17ac35ac7499b3db23fa85419e05f
parenta997e5fa30cfdcdf35645fb0a9d1679dd3ae1aab
Merge ... 'a5ceef80167451640ed57234e28008169c49ef38'
     and 'c6d6222ed4db4cbb388138ad85e72ecd5dcbda73'