Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 30 Oct 2008 22:52:58 +0000 (23:52 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 30 Oct 2008 22:52:58 +0000 (23:52 +0100)
commitebf7f6325c0587bdea3bcdcf37daa46b3c8e0c78
tree54b8ec41657d43e8fb667153e8957c89e04cdc28
parent188020b1293a03e7dd8b121c6a5a35b5e2977e1d
parentb694b15ff48d0a019db7bf4c3c622823a7da93c4
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

packages/gstreamer/gst-plugins-bad_0.10.6.bb
packages/gstreamer/gst-plugins-base_0.10.17.bb
packages/gstreamer/gst-plugins.inc
classes/package.bbclass
conf/checksums.ini
packages/gstreamer/gst-plugins-bad_0.10.6.bb
packages/gstreamer/gst-plugins-base_0.10.17.bb
packages/gstreamer/gst-plugins.inc