[oe-commits] Sergey Lapin : Merge branch 'ieee80215' of git at git.openembedded.net: openembedded into ieee80215

[GIT User account]

Module: openembedded.git
Branch: ieee80215
Commit: 7eee8a7d69244d34dfa8a7ba709a8e9faeb6c5b2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7eee8a7d69244d34dfa8a7ba709a8e9faeb6c5b2

Author: Sergey Lapin <slapin at ossfans.org>
Date:   Thu Jan 29 18:39:54 2009 +0300

Merge branch 'ieee80215' of git at git.openembedded.net:openembedded into ieee80215

Conflicts:

	packages/net-snmp/net-snmp_svn.bb
	packages/wireshark/tshark_0.99.4.bb
	packages/wireshark/wireshark_0.99.4.bb

---