Merge commit 'origin/cupcake'
authorMarcelo E. Magallon <marcelo.magallon@gmail.com>
Tue, 24 Mar 2009 02:21:57 +0000 (02:21 +0000)
committerMarcelo E. Magallon <marcelo.magallon@gmail.com>
Tue, 24 Mar 2009 02:21:57 +0000 (02:21 +0000)
commit50a6e44c44e9c4b9b862d6d75dbd9fd391759f88
treebc68087ab1f97b29e5db8133d999c50d58dd73bd
parent649f21f5ba0b1f2bffed58f4c975126d70902fde
parent954227e9ea9583308cd675f5cb22208084253654
Merge commit 'origin/cupcake'
default.xml