[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 561265da399fd5881c3ffe7603fc743db9bd75ce
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=561265da399fd5881c3ffe7603fc743db9bd75ce

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar  2 21:24:35 2010 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/shr/libphone-utils_git.bb

---