[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 3b22568664b0c0017ea793fd3cf5fde433e95717

[dswitkin]

The following commit has been merged in the upstream branch:
commit e4861bb5c9dcba06887c00ee3a76d30fe45a8399
Author: dswitkin <dswitkin at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Thu Mar 25 16:17:52 2010 +0000

    Bumped the version to Barcode Scanner 3.21 final.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1254 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e93be78..90f4111 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.21 beta 1"
-          android:versionCode="46">
+          android:versionName="3.21"
+          android:versionCode="47">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>

-- 
Multi-format 1D/2D barcode image processing library