[oe-commits] Frans Meulenbroeks : Merge branch 'org.openembedded.dev' of git. openembedded.org:openembedded into org.openembedded.dev

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c326ad5a1960df22c5efd71bd815b9b12688556e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c326ad5a1960df22c5efd71bd815b9b12688556e

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sat Jun 12 22:21:07 2010 +0200

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
	recipes/tgt/tgt_1.0.5.bb

---