Merge lp:~cr3/ubuntu-friendly/854636 into lp:ubuntu-friendly

[Marc Tardif]

=== modified file 'apps/results/api.py'
--- apps/results/api.py	2011-10-10 17:46:10 +0000
+++ apps/results/api.py	2011-10-11 12:12:24 +0000
@@ -369,10 +369,6 @@
         p_name = d.product_name
         v_name = d.vendor_name
         category = d.category_name.lower()
-        if d.bus_name is not None and \
-            d.bus_name == 'input' and \
-            category == 'video':
-            category = 'capture'
         return {'identifier': self._generate_device_id(d),
                     'name': p_name,
                     'vendor_name': v_name,