Merge "Make compact carrier label single line" into gingerbread

            <com.android.systemui.statusbar.CarrierLabel

                 android:gravity="bottom|right|center"

                 android:textAppearance="@style/TextAppearance.StatusBar.Title"

                 android:singleLine="true"

                 android:background="@android:color/transparent"

                 android:layout_marginRight="6.0dip"

                 android:layout_width="fill_parent"