Squashed commit of the following:
Squashed commit of the following:

commit eb47cebbed3beb4676ff657e15d72e4ab90e573a
Author: Nick Sawadsky <nick@optemo.com>
Date:   Fri Sep 28 09:46:11 2012 -0700

    Test change 2 on branch 2.

    Change-Id: I357ad551b50e8f1a4709addc0ff492295d4d7d2c

commit 5d74567dbba90506647998da6864ee29e8fd080c
Merge: 4d15e1d 820eb41
Author: Nick Sawadsky <nick@optemo.com>
Date:   Fri Sep 28 09:46:02 2012 -0700

    Merge remote-tracking branch 'origin/master' into branch2

    Conflicts:
    	test.txt

    Change-Id: I08d2441970c0fd9314c2bee24af9c15186817eab

commit 4d15e1d2db74a9501613c673cbd54542705aa4d1
Author: Nick Sawadsky <nick@optemo.com>
Date:   Fri Sep 28 09:45:26 2012 -0700

    Test change on branch 2.

    Change-Id: Idf4e2c793df317ece5c2c638a462c57f88a34d18

Change-Id: I64beb85e00e4f12591c63ce74f25b20d3c60fcb8

optemo/firehose,optemo/firehose,optemo/firehose