Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp * commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45': Fix for bug 2548048 - it was impossible for applications to discover
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp * commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45': Fix for bug 2548048 - it was impossible for applications to discover