Merge branch 'master' of gitorious.org:opensuse/yastroid
authorStephen Shaw <sshaw@decriptor.com>
Thu, 10 Jun 2010 22:08:22 +0000 (16:08 -0600)
committerStephen Shaw <sshaw@decriptor.com>
Thu, 10 Jun 2010 22:08:22 +0000 (16:08 -0600)
commit0644475ac3fe6a2b2e41ab64b9c10d4ef4b9a3ab
treeaf3065d6db12c5d6a8420ac44960a75d5acf2015
parent12f0bdbd79cd8ba3d205d7bac639939616490e8f
parentc5792de60bcbe755ad29b9457a78bcd6ee2e7942
Merge branch 'master' of gitorious.org:opensuse/yastroid

Conflicts:
AndroidManifest.xml
res/values/strings.xml
AndroidManifest.xml
res/values/strings.xml