Merge branch 'testing' of gitorious.org:chakra-packages/desktop into testing

This commit is contained in:
Drake 2010-12-22 09:31:35 +00:00
commit 5373963d24