Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 8 Jun 2009 11:35:56 +0000 (13:35 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 8 Jun 2009 11:35:56 +0000 (13:35 +0200)
commit22337161300c784b3a713e414b5ee405fbb8842a
treea7977760482c0bdedc3d9a7c8a7b0f023beff254
parentd40c9b8da304c4a28077d53e8119b15c4dda5edf
parent7f48842581a9b387fef569e94b9bc67bb77aec63
Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox

Conflicts:

recipes/gstreamer/gst-plugins-good_0.10.13.bb
conf/checksums.ini