merge fix
authorroot <root@beagleboard.gateway.2wire.net>
Thu, 4 Apr 2013 14:02:59 +0000 (15:02 +0100)
committerroot <root@beagleboard.gateway.2wire.net>
Thu, 4 Apr 2013 14:02:59 +0000 (15:02 +0100)
commit7fe7067f9a0b8f677ac904cf8fe17ca53e803edd
treed37f635ea238d2602e03773bd9d1082e8c92e131
parentb925dd5d899d4e8369b43a3623449de88bc5ea21
parent985f97ee75d9c3b29057585b02dcfaa070840b6e
merge fix
lib/engine.lua
lib/gps.lua