Merge branch 'master' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 06:09:06 +0000 (22:09 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 06:09:06 +0000 (22:09 -0800)
commit639b7839323bf9bb0ce41d0cc67e956119f05d66
tree847bf16ef75628ad75f8301109a08ba26ebddc5b
parent468a5d3a17fc14c75a429561aa4d7ee16e939308
parent365d6f5b08e849d8a7be579eae5663bc852935d7
Merge branch 'master' into diablo-package