merge of '399ad82a65eae57d617ef7178f450016dcc3c1da'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 12 Oct 2007 13:40:29 +0000 (13:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 12 Oct 2007 13:40:29 +0000 (13:40 +0000)
commit9849e6235af0f15f33bfb8ab71c15cd341c0dd4e
tree5e04ec36121c89acf67f3eb14a06f945713358eb
parent5cae964a9a49885aeac6af96aae85cc5b204acbc
parent8baf39c3f07d216960ecf6320cce022cc37a802b
Merge ... '399ad82a65eae57d617ef7178f450016dcc3c1da'
     and '5e7921c266d5822c71d7e845436f0c477d53892e'