merge of '1d43b066145d51036ada398df009600d2e861364'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:20:28 +0000 (10:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:20:28 +0000 (10:20 +0000)
commitd9a54a4705d13b90f074817368059cb8b0f20f20
tree98c28cd68a26160aeb92ef14bba5f2e6cfa018bf
parentc8f31007fac82944cc5569c63734985f684ae09c
parent7253db0b88feba67ff9974c06ff06f0dff492bee
Merge ... '1d43b066145d51036ada398df009600d2e861364'
     and '91d610fe22ec5f30832680d42abf443bcd99fe6c'