merge of 'a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4'
authorKoen Kooi <koen@openembedded.org>
Thu, 12 Apr 2007 08:16:08 +0000 (08:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 12 Apr 2007 08:16:08 +0000 (08:16 +0000)
commit37a87ac34f26f3e5f4afeded2fb1fc25d4f0137d
tree8f4abdeae389cb9772d1838b028388ecd126933c
parent797d987e5133f3579163b3cead61b9917a1d9390
parentbae26ec4702cef66ffebe94bf47941777bb06f92
Merge ... 'a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4'
     and 'aee4afc7bd079e28f35b43cc08b0559015472e42'
packages/gloox/.mtn2git_empty
packages/gloox/gloox_0.8.1.bb
packages/iksemel/.mtn2git_empty
packages/iksemel/iksemel_1.2.bb