Merge commit 'refs/merge-requests/3' of git://gitorious.org/meego-handset-ux/bluetooth-qt
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 15 Jul 2011 22:15:08 +0000 (15:15 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 15 Jul 2011 22:15:08 +0000 (15:15 -0700)
1  2 
bluetooth-qt/bluetoothdevicemodel.cpp

Simple merge