merge of '81566ccb8400689db54be19c2d4bbb9bcab8a73b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 20:03:28 +0000 (20:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 20:03:28 +0000 (20:03 +0000)
commit19d1ceccd6b74ae0a084b8bb41da040d3dc5b2bf
treede9ba235847f97c2df8e32a17417b4329be0fe39
parentd155f2acf615ba3e52ca60032a58a6e778b12321
parent4e02f679ba23d184fd0cc207222bff88171936b2
Merge ... '81566ccb8400689db54be19c2d4bbb9bcab8a73b'
     and 'c386b75d3046ae9a229198121bffd56b36b626c6'