Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org...
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Sat, 12 Jun 2010 20:21:07 +0000 (22:21 +0200)
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Sat, 12 Jun 2010 20:21:07 +0000 (22:21 +0200)
commitc326ad5a1960df22c5efd71bd815b9b12688556e
tree09bd868c4446f3510a070ed601e7b67c6b791cde
parentdd0fdfe9ed922189f4251c688b7a16faa76cd904
parent2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
recipes/tgt/tgt_1.0.5.bb
recipes/iscsi-target/iscsi-target_1.4.20.1.bb
recipes/tgt/tgt_1.0.5.bb