Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorJoseph T <joseph.t@samsung.com>
Wed, 22 Sep 2010 22:03:43 +0000 (18:03 -0400)
committerJoseph T <joseph.t@samsung.com>
Wed, 22 Sep 2010 22:03:43 +0000 (18:03 -0400)

Trivial merge