diff -r 1a0caf61fc7c -r 85977e23817a AndroidManifest.xml
--- a/AndroidManifest.xml	Sat Feb 05 21:25:11 2011 +0100
+++ b/AndroidManifest.xml	Fri Feb 25 15:11:29 2011 +0100
@@ -13,7 +13,8 @@
 			</intent-filter>
 		</activity>
 		<activity android:name=".ui.wizard.Account" android:label="Account wizard" />
-		<activity android:name=".ui.wizard.AccountConfigure" android:label="Account wizard" />
+		<activity android:name=".ui.wizard.AccountConfigure"
+			android:label="Account wizard" />
 		<activity android:name=".ui.LoginAnim" android:label="@string/login_login_progress"
 			android:launchMode="singleTop" android:screenOrientation="portrait" />
 		<activity android:name=".ui.Settings" android:label="@string/edit_settings_name">
@@ -30,8 +31,7 @@
 			</intent-filter>
 		</activity>
 		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle"
-		    android:launchMode="singleTask"
-		    android:windowSoftInputMode="stateHidden" >
+			android:launchMode="singleTask" android:windowSoftInputMode="stateHidden">
 			<intent-filter android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -76,6 +76,14 @@
 			android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter> </receiver>
 		-->
+		<service android:name=".account.AuthenticatorService"
+			android:exported="true" android:process=":auth">
+			<intent-filter>
+				<action android:name="android.accounts.AccountAuthenticator" />
+			</intent-filter>
+			<meta-data android:name="android.accounts.AccountAuthenticator"
+				android:resource="@xml/authenticator" />
+		</service>
 		<service android:name="BeemService" android:enabled="true"
 			android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
 			<intent-filter>
@@ -87,13 +95,15 @@
 	</application>
 	<permission android:permissionGroup="android.permission-group.NETWORK"
 		android:label="BeemService" android:description="@string/BeemServiceDescription"
-		android:name="com.beem.project.beem.BEEM_SERVICE"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.VIBRATE"/>
+		android:name="com.beem.project.beem.BEEM_SERVICE" />
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"/>
-	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="7" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
 	<supports-screens android:largeScreens="true"
-		android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" />
-</manifest>
+		android:normalScreens="true" android:smallScreens="true"
+		android:anyDensity="true" />
+</manifest>
\ No newline at end of file