Merge develop into device
authorPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 06:06:59 +0000 (01:06 -0500)
committerPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 06:06:59 +0000 (01:06 -0500)
commitef47246321466880c8313fbbe06a4d375b02ea9f
treeec1ebd03ecb1502182a428283412d9fdbb3fb34b
parentc05958186d19e052f95121826be14e86880f4e58
parentc833f56b197c83dbe95c0796141e2b5d6dbed2cd
Merge develop into device