merge of '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 23 Dec 2007 19:47:06 +0000 (19:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 23 Dec 2007 19:47:06 +0000 (19:47 +0000)
commit177da4f8e6ad3f6c69d679ee3f2a6b99ddb9ff18
tree71377d116ace75ec0a0055cc6175b1bc377421fc
parent70c6a276154dba8bacf22471bbc41b247dbe4077
parent4169220a9f970264b6b1ff75bfd065c380827a83
Merge ... '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
     and '7c0754d01145df6906c2cfc824da2da420a2fe22'