Merge branch 'franklin' of git://gitorious.org/matrix-gui-v2/matrix-gui-v2 into franklin
authorFranklin Cooper Jr <fcooper@ti.com>
Thu, 20 Oct 2011 23:38:22 +0000 (18:38 -0500)
committerFranklin Cooper Jr <fcooper@ti.com>
Thu, 20 Oct 2011 23:38:22 +0000 (18:38 -0500)
commitfdeedb53b04911ae06473d6ffd417873bb9dd78e
tree6fe5fc7f6ea4f08ba395af4150f7cbbd3fbf345d
parent06cbdb269a455f1ee0374fec3cda6e7971dc0b70
parent85e8215e3e182c07c359ba6b4a747e79fcd2e5ee
Merge branch 'franklin' of git://gitorious.org/matrix-gui-v2/matrix-gui-v2 into franklin