merge of 'a73ff29a7779a9a8a8b4220a0bab38e53c25c6a9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 May 2007 14:22:05 +0000 (14:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 May 2007 14:22:05 +0000 (14:22 +0000)
commit4b354150f6b88b8507f1fab1bc6df48103f84b10
tree64316541dc9d1a4a044f73b7be6d54e16c6f29db
parent7872e547cbf3aeb1597efcfbe5310fe20303fdd2
parent3813396dd66bc39ee6f381e1c2250e8543b3497b
Merge ... 'a73ff29a7779a9a8a8b4220a0bab38e53c25c6a9'
     and 'f497aad6e34e5d5cadbd7393758db14fdd9b005d'