Merge branch 'master' of git@gitorious.org:rit_olpc/rit_olpc
authorEric Kenvin <esk7610@rit.edu>
Thu, 17 Sep 2009 18:09:32 +0000 (23:09 +0500)
committerEric Kenvin <esk7610@rit.edu>
Thu, 17 Sep 2009 18:09:32 +0000 (23:09 +0500)
commite11c6fe9a468aee24ff5f96a61403e164f501434
tree51c5f8b14f7302704d3dee9ef3d6d050d00ece0d
parentbb70f8fa6b854115675dceecc085e7c666f3df18
parenta51aec9ad7fc9daa4f79fbf428ff8d23ef06c1a1
Merge branch 'master' of git@gitorious.org:rit_olpc/rit_olpc

Conflicts:
MyNameIs
MyNameIs