Merge branch 'master' of git://gitorious.org/freerunner-navigation-board/bmp085
authorMichele Brocco <ssj2micvm@gmail.com>
Wed, 31 Mar 2010 20:57:48 +0000 (22:57 +0200)
committerMichele Brocco <ssj2micvm@gmail.com>
Wed, 31 Mar 2010 20:57:48 +0000 (22:57 +0200)
commit915529b51f739fd8ea14facf4fc6f776a0745a7b
treec50ad0b1aa1a2bafcd36f40e352a39759a0ede11
parent55f345df390c8b0c0bf7e4c56270bb3779f95c2a
parent3a2bb1757c693fea006d838fd07586bb48a73ad3
Merge branch 'master' of git://gitorious.org/freerunner-navigation-board/bmp085

Conflicts:
userspace/Makefile
userspace/Makefile