Merge branch 'master' of https://git.maemo.org/projects/theonering
authorEd Page <eopage@byu.net>
Sat, 17 Oct 2009 21:38:30 +0000 (16:38 -0500)
committerEd Page <eopage@byu.net>
Sat, 17 Oct 2009 21:38:30 +0000 (16:38 -0500)
commit2818cfdf68997350d8aaf40c6abf990a91996460
tree8637b79c909e8b504a940c87bcbe041d96867591
parentb0a82abb6a6763f3d72bb898148cd1ab8c9842f1
parentd5f69577092f2929bf2fe6eae3848a646c5f2bc1
Merge branch 'master' of https://git.maemo.org/projects/theonering