Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 22:56:17 +0000 (23:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 22:56:17 +0000 (23:56 +0100)

Trivial merge