Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 06:09:19 +0000 (06:09 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 06:09:19 +0000 (06:09 +0000)
commitc842db5eed5f81fbdb173181599eeb02278a0210
treec1e6d66e64322db798365ce74addcf6cbb7d6068
parenta8bd3c45d9ff4bf28303b26ac9fddc628ff07cdc
parent84e368f680c20efaabd1468c9d66eb13b2c62350
Merge branch 'stable'